Merge branch 'linus' into stackprotector

[linux-2.6-omap-h63xx.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index 2a7ce0f8e45353af2204c017c1921afdd0ba5c91..07da4dea50c3f86b60beb3202450b1444b83dcc6 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -14,6 +14,7 @@
 #include <linux/proc_fs.h>
 #include <linux/kernel.h>
 #include <linux/syscalls.h>
+#include <linux/stackprotector.h>
 #include <linux/string.h>
 #include <linux/ctype.h>
 #include <linux/delay.h>
@@ -563,6 +564,12 @@ asmlinkage void __init start_kernel(void)
        unwind_init();
        lockdep_init();
        debug_objects_early_init();
+
+       /*
+        * Set up the the initial canary ASAP:
+        */
+       boot_init_stack_canary();
+
        cgroup_init_early();
 
        local_irq_disable();