diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-10-21 11:54:48 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-10-21 11:54:48 +1100 |
commit | dfb472501fdfbdb396a03c127496a846a4fda108 (patch) | |
tree | 6bd64255bbb7f4b7a2f1550e8525300e5226d129 /init | |
parent | b8e7883593812a83aff0c42e5e8010aba2b0dfb5 (diff) | |
parent | c2d98093cf3fd7a9ef34b1ae9aa12a4a5b061872 (diff) |
Merge commit 'stackprotector/auto-stackprotector-next'
Conflicts:
kernel/fork.c
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 3e17a3bafe60..7c2a26290da5 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> @@ -552,6 +553,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(); |