From 3d9077e6d4a37b51eda3039f2c376697a5329fb9 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Mon, 9 Jun 2014 19:31:52 +0100 Subject: [PATCH] arm64: smp: Fix mismerge Signed-off-by: Mark Brown --- arch/arm64/kernel/smp.c | 3 --- 1 file changed, 3 deletions(-) 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(); -- 2.34.1