aboutsummaryrefslogtreecommitdiffstats
path: root/init/main.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-02-14 03:44:08 -0500
committerThomas Gleixner <tglx@linutronix.de>2008-05-26 10:15:32 -0400
commit420594296838fdc9a674470d710cda7d1487f9f4 (patch)
tree2596b86ce8dcdfe3679964536efce45014bc6cf2 /init/main.c
parent18aa8bb12dcb10adc3d7c9d69714d53667c0ab7f (diff)
x86: fix the stackprotector canary of the boot CPU
Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'init/main.c')
-rw-r--r--init/main.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/init/main.c b/init/main.c
index a84322ca64a2..b44e4eb0f5e3 100644
--- a/init/main.c
+++ b/init/main.c
@@ -546,6 +546,12 @@ asmlinkage void __init start_kernel(void)
546 unwind_init(); 546 unwind_init();
547 lockdep_init(); 547 lockdep_init();
548 debug_objects_early_init(); 548 debug_objects_early_init();
549
550 /*
551 * Set up the the initial canary ASAP:
552 */
553 boot_init_stack_canary();
554
549 cgroup_init_early(); 555 cgroup_init_early();
550 556
551 local_irq_disable(); 557 local_irq_disable();