From: Mark Brown <broonie@linaro.org>
Date: Mon, 9 Jun 2014 18:31:52 +0000 (+0100)
Subject: arm64: smp: Fix mismerge
X-Git-Tag: firefly_0821_release~3680^2~104^2~4
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3d9077e6d4a37b51eda3039f2c376697a5329fb9;p=firefly-linux-kernel-4.4.55.git

arm64: smp: Fix mismerge

Signed-off-by: Mark Brown <broonie@linaro.org>
---

diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c
index f18fb802b790..7c868a2ac38b 100644
--- a/arch/arm64/kernel/smp.c
+++ b/arch/arm64/kernel/smp.c
@@ -170,9 +170,6 @@ asmlinkage void __cpuinit secondary_start_kernel(void)
 	set_cpu_online(cpu, true);
 	complete(&cpu_running);
 
-	local_irq_enable();
-	local_fiq_enable();
-
 	local_dbg_enable();
 	local_irq_enable();
 	local_fiq_enable();