aboutsummaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2008-02-09 17:24:09 -0500
committerThomas Gleixner <tglx@linutronix.de>2008-02-09 17:24:09 -0500
commita03c2a48e02aacaaea211c94691b729be357e047 (patch)
tree733e1b071c55900a2a88bdf2841a8cd8ee28d19f /init
parent166124fde978b5a6c4412fb295c7f39711beb1b0 (diff)
x86: DEBUG_PAGEALLOC: enable after mem_init()
DEBUG_PAGEALLOC must not be enabled before mem_init(). Before this point there is nothing to allocate. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'init')
-rw-r--r--init/main.c2
1 files changed, 1 insertions, 1 deletions
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();