aboutsummaryrefslogtreecommitdiff
path: root/arch/x86
diff options
context:
space:
mode:
authorVlastimil Babka2023-12-28 19:19:50 +0100
committerVlastimil Babka2024-01-04 12:32:19 +0100
commit61d7e367f8bcc8083f02dcc5ce89b98b1480929d (patch)
tree3252503bb4edf51ca281f20d50836743e065b563 /arch/x86
parent31bda717d7777b8b6cf542af2730651ad6bb4839 (diff)
parent782f8906f8057efc7151b4b98b0a0280a71d005f (diff)
Merge branch 'slab/for-6.8/slub-hook-cleanups' into slab/for-next
Merge the SLAB allocator removal and a number of subsequent SLUB cleanups and optimizations.
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 3762f41bb092..3f460f334d4e 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -169,7 +169,7 @@ config X86
select HAS_IOPORT
select HAVE_ACPI_APEI if ACPI
select HAVE_ACPI_APEI_NMI if ACPI
- select HAVE_ALIGNED_STRUCT_PAGE if SLUB
+ select HAVE_ALIGNED_STRUCT_PAGE
select HAVE_ARCH_AUDITSYSCALL
select HAVE_ARCH_HUGE_VMAP if X86_64 || X86_PAE
select HAVE_ARCH_HUGE_VMALLOC if X86_64