diff options
Diffstat (limited to 'init')
-rw-r--r-- | init/Kconfig | 2 | ||||
-rw-r--r-- | init/main.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/init/Kconfig b/init/Kconfig index 455170e1c1e3..824d48cb67bf 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
@@ -587,7 +587,7 @@ config COMPAT_BRK | |||
587 | disabled, and can be overriden runtime by setting | 587 | disabled, and can be overriden runtime by setting |
588 | /proc/sys/kernel/randomize_va_space to 2. | 588 | /proc/sys/kernel/randomize_va_space to 2. |
589 | 589 | ||
590 | On non-ancient distros (post-2000 ones) Y is usually a safe choice. | 590 | On non-ancient distros (post-2000 ones) N is usually a safe choice. |
591 | 591 | ||
592 | config BASE_FULL | 592 | config BASE_FULL |
593 | default y | 593 | default y |
diff --git a/init/main.c b/init/main.c index c59859b85db0..8b1982082ad8 100644 --- a/init/main.c +++ b/init/main.c | |||
@@ -558,7 +558,6 @@ asmlinkage void __init start_kernel(void) | |||
558 | preempt_disable(); | 558 | preempt_disable(); |
559 | build_all_zonelists(); | 559 | build_all_zonelists(); |
560 | page_alloc_init(); | 560 | page_alloc_init(); |
561 | enable_debug_pagealloc(); | ||
562 | printk(KERN_NOTICE "Kernel command line: %s\n", boot_command_line); | 561 | printk(KERN_NOTICE "Kernel command line: %s\n", boot_command_line); |
563 | parse_early_param(); | 562 | parse_early_param(); |
564 | parse_args("Booting kernel", static_command_line, __start___param, | 563 | parse_args("Booting kernel", static_command_line, __start___param, |
@@ -614,6 +613,7 @@ asmlinkage void __init start_kernel(void) | |||
614 | vfs_caches_init_early(); | 613 | vfs_caches_init_early(); |
615 | cpuset_init_early(); | 614 | cpuset_init_early(); |
616 | mem_init(); | 615 | mem_init(); |
616 | enable_debug_pagealloc(); | ||
617 | cpu_hotplug_init(); | 617 | cpu_hotplug_init(); |
618 | kmem_cache_init(); | 618 | kmem_cache_init(); |
619 | setup_per_cpu_pageset(); | 619 | setup_per_cpu_pageset(); |