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 f18fb802b790cab77815564f9718acfa7b4415a7..7c868a2ac38b23ed03a919c70ef1f2b7e1e8c6b6 100644 (file)
--- 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();