1 files changed, 0 insertions, 15 deletions

diff --git a/kernel/sched/idle.c b/kernel/sched/idle.c
index 16f84142f2f4..f5516bae0c1b 100644
--- a/kernel/sched/idle.c
+++ b/kernel/sched/idle.c
@@ -347,21 +347,6 @@ EXPORT_SYMBOL_GPL(play_idle);
 
 void cpu_startup_entry(enum cpuhp_state state)
 {
-        /*
-         * This #ifdef needs to die, but it's too late in the cycle to
-         * make this generic (ARM and SH have never invoked the canary
-         * init for the non boot CPUs!). Will be fixed in 3.11
-         */
-#ifdef CONFIG_X86
-        /*
-         * If we're the non-boot CPU, nothing set the stack canary up
-         * for us. The boot CPU already has it initialized but no harm
-         * in doing it again. This is a good place for updating it, as
-         * we wont ever return from this function (so the invalid
-         * canaries already on the stack wont ever trigger).
-         */
-        boot_init_stack_canary();
-#endif
         arch_cpu_idle_prepare();
         cpuhp_online_idle(state);
         while (1)