diff options
author | Duncaen <duncaen@voidlinux.org> | 2024-04-10 20:11:03 +0000 |
---|---|---|
committer | Duncaen <duncaen@voidlinux.org> | 2024-04-11 14:30:12 +0000 |
commit | 57e107ef7bbb69d0a3f19d6f4cd2fbf5d5308c9a (patch) | |
tree | cdd518c6f099bd83c39ed5cd1d57358f4477acd5 | |
parent | 9147a7ea4a1e875e32355ce7021fd05078bc5f77 (diff) | |
download | void-packages-57e107ef7bbb69d0a3f19d6f4cd2fbf5d5308c9a.tar void-packages-57e107ef7bbb69d0a3f19d6f4cd2fbf5d5308c9a.tar.gz void-packages-57e107ef7bbb69d0a3f19d6f4cd2fbf5d5308c9a.tar.bz2 void-packages-57e107ef7bbb69d0a3f19d6f4cd2fbf5d5308c9a.tar.lz void-packages-57e107ef7bbb69d0a3f19d6f4cd2fbf5d5308c9a.tar.xz void-packages-57e107ef7bbb69d0a3f19d6f4cd2fbf5d5308c9a.tar.zst void-packages-57e107ef7bbb69d0a3f19d6f4cd2fbf5d5308c9a.zip |
linux6.8: update to 6.8.5.
-rw-r--r-- | srcpkgs/linux6.8/files/i386-dotconfig | 5 | ||||
-rw-r--r-- | srcpkgs/linux6.8/files/x86_64-dotconfig | 5 | ||||
-rw-r--r-- | srcpkgs/linux6.8/patches/revert-gbpages.patch | 75 | ||||
-rw-r--r-- | srcpkgs/linux6.8/template | 4 |
4 files changed, 10 insertions, 79 deletions
diff --git a/srcpkgs/linux6.8/files/i386-dotconfig b/srcpkgs/linux6.8/files/i386-dotconfig index 5bf6d1a44e9..9c8566b6f53 100644 --- a/srcpkgs/linux6.8/files/i386-dotconfig +++ b/srcpkgs/linux6.8/files/i386-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 6.8.3 Kernel Configuration +# Linux/i386 6.8.5 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y @@ -507,6 +507,9 @@ CONFIG_RETPOLINE=y CONFIG_RETHUNK=y # CONFIG_GDS_FORCE_MITIGATION is not set CONFIG_MITIGATION_RFDS=y +CONFIG_SPECTRE_BHI_ON=y +# CONFIG_SPECTRE_BHI_OFF is not set +# CONFIG_SPECTRE_BHI_AUTO is not set # # Power management and ACPI options diff --git a/srcpkgs/linux6.8/files/x86_64-dotconfig b/srcpkgs/linux6.8/files/x86_64-dotconfig index 313f4cfa5fa..385efba976c 100644 --- a/srcpkgs/linux6.8/files/x86_64-dotconfig +++ b/srcpkgs/linux6.8/files/x86_64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 6.8.3 Kernel Configuration +# Linux/x86_64 6.8.5 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y @@ -553,6 +553,9 @@ CONFIG_CPU_SRSO=y CONFIG_SLS=y # CONFIG_GDS_FORCE_MITIGATION is not set CONFIG_MITIGATION_RFDS=y +CONFIG_SPECTRE_BHI_ON=y +# CONFIG_SPECTRE_BHI_OFF is not set +# CONFIG_SPECTRE_BHI_AUTO is not set CONFIG_ARCH_HAS_ADD_PAGES=y # diff --git a/srcpkgs/linux6.8/patches/revert-gbpages.patch b/srcpkgs/linux6.8/patches/revert-gbpages.patch deleted file mode 100644 index 48098db8682..00000000000 --- a/srcpkgs/linux6.8/patches/revert-gbpages.patch +++ /dev/null @@ -1,75 +0,0 @@ -From c567f2948f57bdc03ed03403ae0234085f376b7d Mon Sep 17 00:00:00 2001 -From: Ingo Molnar <mingo@kernel.org> -Date: Mon, 25 Mar 2024 11:47:51 +0100 -Subject: Revert "x86/mm/ident_map: Use gbpages only where full GB page should - be mapped." - -This reverts commit d794734c9bbfe22f86686dc2909c25f5ffe1a572. - -While the original change tries to fix a bug, it also unintentionally broke -existing systems, see the regressions reported at: - - https://lore.kernel.org/all/3a1b9909-45ac-4f97-ad68-d16ef1ce99db@pavinjoseph.com/ - -Since d794734c9bbf was also marked for -stable, let's back it out before -causing more damage. - -Note that due to another upstream change the revert was not 100% automatic: - - 0a845e0f6348 mm/treewide: replace pud_large() with pud_leaf() - -Signed-off-by: Ingo Molnar <mingo@kernel.org> -Cc: <stable@vger.kernel.org> -Cc: Russ Anderson <rja@hpe.com> -Cc: Steve Wahl <steve.wahl@hpe.com> -Cc: Dave Hansen <dave.hansen@linux.intel.com> -Link: https://lore.kernel.org/all/3a1b9909-45ac-4f97-ad68-d16ef1ce99db@pavinjoseph.com/ -Fixes: d794734c9bbf ("x86/mm/ident_map: Use gbpages only where full GB page should be mapped.") ---- - arch/x86/mm/ident_map.c | 23 +++++------------------ - 1 file changed, 5 insertions(+), 18 deletions(-) - -diff --git a/arch/x86/mm/ident_map.c b/arch/x86/mm/ident_map.c -index a204a332c71fc5..968d7005f4a724 100644 ---- a/arch/x86/mm/ident_map.c -+++ b/arch/x86/mm/ident_map.c -@@ -26,31 +26,18 @@ static int ident_pud_init(struct x86_mapping_info *info, pud_t *pud_page, - for (; addr < end; addr = next) { - pud_t *pud = pud_page + pud_index(addr); - pmd_t *pmd; -- bool use_gbpage; - - next = (addr & PUD_MASK) + PUD_SIZE; - if (next > end) - next = end; - -- /* if this is already a gbpage, this portion is already mapped */ -- if (pud_large(*pud)) -- continue; -- -- /* Is using a gbpage allowed? */ -- use_gbpage = info->direct_gbpages; -- -- /* Don't use gbpage if it maps more than the requested region. */ -- /* at the begining: */ -- use_gbpage &= ((addr & ~PUD_MASK) == 0); -- /* ... or at the end: */ -- use_gbpage &= ((next & ~PUD_MASK) == 0); -- -- /* Never overwrite existing mappings */ -- use_gbpage &= !pud_present(*pud); -- -- if (use_gbpage) { -+ if (info->direct_gbpages) { - pud_t pudval; - -+ if (pud_present(*pud)) -+ continue; -+ -+ addr &= PUD_MASK; - pudval = __pud((addr - info->offset) | info->page_flag); - set_pud(pud, pudval); - continue; --- -cgit 1.2.3-korg - diff --git a/srcpkgs/linux6.8/template b/srcpkgs/linux6.8/template index 653e6fc1393..ae978880d1f 100644 --- a/srcpkgs/linux6.8/template +++ b/srcpkgs/linux6.8/template @@ -1,6 +1,6 @@ # Template file for 'linux6.8' pkgname=linux6.8 -version=6.8.4 +version=6.8.5 revision=1 short_desc="Linux kernel and modules (${version%.*} series)" maintainer="Duncaen <duncaen@voidlinux.org>" @@ -14,7 +14,7 @@ if [ "${version##*.}" != 0 ]; then fi checksum="c969dea4e8bb6be991bbf7c010ba0e0a5643a3a8d8fb0a2aaa053406f1e965f3 - b30537416971e0923ca0a85d63013a05924c7e6e2286f7cd16e4ce59f95e6523" + 095767728faad4f7b15c075cf2103a8413b7932915fd9239865b90d3ecc91fd5" python_version=3 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR. |