2 files changed, 0 insertions, 8 deletions

diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c
index 248a15db37f2..1c0a9be2ffa8 100644
--- a/arch/arm64/kernel/process.c
+++ b/arch/arm64/kernel/process.c
@@ -85,11 +85,6 @@ EXPORT_SYMBOL_GPL(pm_power_off);
 void (*arm_pm_restart)(enum reboot_mode reboot_mode, const char *cmd);
 EXPORT_SYMBOL_GPL(arm_pm_restart);
 
-void arch_cpu_idle_prepare(void)
-{
-        local_fiq_enable();
-}
-
 /*
  * This is our default idle handler.
  */
@@ -138,7 +133,6 @@ void machine_restart(char *cmd)
 
         /* Disable interrupts first */
         local_irq_disable();
-        local_fiq_disable();
 
         /* Now call the architecture specific reboot code. */
         if (arm_pm_restart)
diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c
index 1b7617ab499b..7cfb92a4ab66 100644
--- a/arch/arm64/kernel/smp.c
+++ b/arch/arm64/kernel/smp.c
@@ -161,7 +161,6 @@ asmlinkage void secondary_start_kernel(void)
         complete(&cpu_running);
 
         local_irq_enable();
-        local_fiq_enable();
         local_async_enable();
 
         /*
@@ -495,7 +494,6 @@ static void ipi_cpu_stop(unsigned int cpu)
 
         set_cpu_online(cpu, false);
 
-        local_fiq_disable();
         local_irq_disable();
 
         while (1)