diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-21 14:19:59 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-21 14:19:59 +0200 |
commit | c7ae0d771c087bd922b27b1af73cf60a3c41e32b (patch) | |
tree | 44f33f44325fb3108825dfd5e1ba2b65ad9379de /init | |
parent | 14b395e35d1afdd8019d11b92e28041fad591b71 (diff) | |
parent | db104c724b370804d3ad736f0ef1cda46825d058 (diff) |
Merge branch 'stackprotector' into auto-stackprotector-next
Diffstat (limited to 'init')
-rw-r--r-- | init/main.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/init/main.c b/init/main.c index 756eca4b821a..e4faab7d4097 100644 --- 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> @@ -546,6 +547,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(); |