diff options
Diffstat (limited to 'init')
-rw-r--r-- | init/Kconfig | 1 | ||||
-rw-r--r-- | init/main.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/init/Kconfig b/init/Kconfig index 9c812c5fb6e8..af958ad26d60 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
@@ -1231,7 +1231,6 @@ config SLAB | |||
1231 | per cpu and per node queues. | 1231 | per cpu and per node queues. |
1232 | 1232 | ||
1233 | config SLUB | 1233 | config SLUB |
1234 | depends on BROKEN || NUMA || !DISCONTIGMEM | ||
1235 | bool "SLUB (Unqueued Allocator)" | 1234 | bool "SLUB (Unqueued Allocator)" |
1236 | help | 1235 | help |
1237 | SLUB is a slab allocator that minimizes cache line usage | 1236 | SLUB is a slab allocator that minimizes cache line usage |
diff --git a/init/main.c b/init/main.c index 4a9479ef4540..48df882d51d2 100644 --- a/init/main.c +++ b/init/main.c | |||
@@ -580,8 +580,8 @@ asmlinkage void __init start_kernel(void) | |||
580 | #endif | 580 | #endif |
581 | page_cgroup_init(); | 581 | page_cgroup_init(); |
582 | enable_debug_pagealloc(); | 582 | enable_debug_pagealloc(); |
583 | kmemleak_init(); | ||
584 | debug_objects_mem_init(); | 583 | debug_objects_mem_init(); |
584 | kmemleak_init(); | ||
585 | setup_per_cpu_pageset(); | 585 | setup_per_cpu_pageset(); |
586 | numa_policy_init(); | 586 | numa_policy_init(); |
587 | if (late_time_init) | 587 | if (late_time_init) |