aboutsummaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
Diffstat (limited to 'init')
-rw-r--r--init/main.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/init/main.c b/init/main.c
index 27f6bf6108e9..6aaff34a38c0 100644
--- a/init/main.c
+++ b/init/main.c
@@ -14,6 +14,7 @@
14#include <linux/proc_fs.h> 14#include <linux/proc_fs.h>
15#include <linux/kernel.h> 15#include <linux/kernel.h>
16#include <linux/syscalls.h> 16#include <linux/syscalls.h>
17#include <linux/stackprotector.h>
17#include <linux/string.h> 18#include <linux/string.h>
18#include <linux/ctype.h> 19#include <linux/ctype.h>
19#include <linux/delay.h> 20#include <linux/delay.h>
@@ -550,6 +551,12 @@ asmlinkage void __init start_kernel(void)
550 unwind_init(); 551 unwind_init();
551 lockdep_init(); 552 lockdep_init();
552 debug_objects_early_init(); 553 debug_objects_early_init();
554
555 /*
556 * Set up the the initial canary ASAP:
557 */
558 boot_init_stack_canary();
559
553 cgroup_init_early(); 560 cgroup_init_early();
554 561
555 local_irq_disable(); 562 local_irq_disable();