diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-13 12:59:32 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-13 12:59:32 +1000 |
commit | afbc250aec569e4423e43eb3f3281949519de203 (patch) | |
tree | b9e481943b4f748e1186545d7c063ace0d4cdbc0 /init | |
parent | 6ae696b3e3623ef3307225ddf5e5ae60758781af (diff) | |
parent | c59c0f039235adfa62cafdaade7df68a61f0c5bd (diff) |
Merge commit 'stackprotector/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 693d68874233..51f6b5fe52d2 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> @@ -545,6 +546,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(); |