diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-08-14 13:07:37 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-08-14 13:07:37 +0200 |
commit | 5597fbdec60aff6edc9045cdd8e338953d9a35ed (patch) | |
tree | 3ab2687c65a9eebaf84f78e3592041436ebc68ae /init | |
parent | b635acec48bcaa9183fcbf4e3955616b0d4119b5 (diff) | |
parent | db104c724b370804d3ad736f0ef1cda46825d058 (diff) |
manual merge of stackprotector
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 f6f7042331dc..2cd039eb0f41 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> @@ -550,6 +551,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(); |