diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-10-19 11:17:59 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-10-19 11:17:58 -0700 |
| commit | eddeaeab9440eee45cf229eab87ddf240c2d2d3c (patch) | |
| tree | 0539d24ba6a1999c772ce362bff03d96e6d84186 /init | |
| parent | 778c13d30c0c33bf3e3e15d74cc63ce35768076e (diff) | |
| parent | e710a2332089ae5c59eb7791081a52426464d022 (diff) | |
Merge "init: Move stack canary initialization after setup_arch"
Diffstat (limited to 'init')
| -rw-r--r-- | init/main.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/init/main.c b/init/main.c index fbafa271531c..7d4532bff5da 100644 --- a/init/main.c +++ b/init/main.c @@ -505,11 +505,6 @@ asmlinkage __visible void __init start_kernel(void) smp_setup_processor_id(); debug_objects_early_init(); - /* - * Set up the the initial canary ASAP: - */ - boot_init_stack_canary(); - cgroup_init_early(); local_irq_disable(); @@ -523,6 +518,10 @@ asmlinkage __visible void __init start_kernel(void) page_address_init(); pr_notice("%s", linux_banner); setup_arch(&command_line); + /* + * Set up the the initial canary ASAP: + */ + boot_init_stack_canary(); mm_init_cpumask(&init_mm); setup_command_line(command_line); setup_nr_cpu_ids(); |