From e710a2332089ae5c59eb7791081a52426464d022 Mon Sep 17 00:00:00 2001 From: Laura Abbott Date: Tue, 13 Aug 2013 11:37:53 -0700 Subject: [PATCH] init: Move stack canary initialization after setup_arch Stack canary initialization involves getting a random number. Getting this random number may involve accessing caches or other architectural specific features which are not available until after the architecture is setup. Move the stack canary initialization later to accommodate this. Change-Id: I00b564a2c3172229a44339c061fa380c17fe7d8e Signed-off-by: Laura Abbott [ohaugan@codeaurora.org: Fix trivial merge conflict] Signed-off-by: Olav Haugan --- init/main.c | 9 ++++----- 1 file 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();