diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-23 10:20:15 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-23 10:20:15 +0100 |
| commit | bfe2a3c3b5bf479788d5d5c5561346be6b169043 (patch) | |
| tree | 652c987279db7cd841d556f7bb1a589b57fbd6cc /init | |
| parent | 77835492ed489c0b870f82f4c50687bd267acc0a (diff) | |
| parent | 35d266a24796f02f63299cfe5009dfc0d5a0e820 (diff) | |
| download | kernel_samsung_tuna-bfe2a3c3b5bf479788d5d5c5561346be6b169043.zip kernel_samsung_tuna-bfe2a3c3b5bf479788d5d5c5561346be6b169043.tar.gz kernel_samsung_tuna-bfe2a3c3b5bf479788d5d5c5561346be6b169043.tar.bz2 | |
Merge branch 'core/percpu' into perfcounters/core
Conflicts:
arch/x86/include/asm/hardirq_32.h
arch/x86/include/asm/hardirq_64.h
Semantic merge:
arch/x86/include/asm/hardirq.h
[ added apic_perf_irqs field. ]
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 8442094..bfe4fb0 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> @@ -539,6 +540,12 @@ asmlinkage void __init start_kernel(void) */ lockdep_init(); debug_objects_early_init(); + + /* + * Set up the the initial canary ASAP: + */ + boot_init_stack_canary(); + cgroup_init_early(); local_irq_disable(); |