diff --git a/arch/arm64/include/asm/arch_gicv3.h b/arch/arm64/include/asm/arch_gicv3.h
index 01281a5336cf84ee4a04c2f6daec95d68e3accac..95f243fa0baecad37616aa10c49d9e96d16fe902 100644
--- a/arch/arm64/include/asm/arch_gicv3.h
+++ b/arch/arm64/include/asm/arch_gicv3.h
@@ -190,6 +190,18 @@ static inline void gic_arch_enable_irqs(void)
 	asm volatile ("msr daifclr, #3" : : : "memory");
 }
 
+static inline void gic_arch_disable_irqs(void)
+{
+	asm volatile ("msr daifset, #3" : : : "memory");
+}
+
+static inline void gic_arch_restore_irqs(unsigned long flags)
+{
+	if (gic_supports_nmi())
+		asm volatile ("msr      daif, %0" : : "r" (flags >> 32)
+                                       : "memory");
+}
+
 static inline bool gic_has_relaxed_pmr_sync(void)
 {
 	return cpus_have_cap(ARM64_HAS_GIC_PRIO_RELAXED_SYNC);
diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c
index 9466d61d21c981c9fa2558c5db44dc62faa9f63f..320ce5b18511b6dcfbe3fdf7dc5d2deec03ab013 100644
--- a/kernel/stop_machine.c
+++ b/kernel/stop_machine.c
@@ -25,6 +25,7 @@
 
 #ifdef CONFIG_ARM64
 #include <linux/arm_sdei.h>
+#include <asm/arch_gicv3.h>
 #endif
 
 /*
@@ -239,6 +240,7 @@ static int multi_cpu_stop(void *data)
 				local_irq_disable();
 				hard_irq_disable();
 #ifdef CONFIG_ARM64
+				gic_arch_disable_irqs();
 				sdei_mask_local_cpu();
 #endif
 				break;
@@ -263,6 +265,7 @@ static int multi_cpu_stop(void *data)
 
 #ifdef CONFIG_ARM64
 	sdei_unmask_local_cpu();
+	gic_arch_restore_irqs(flags);
 #endif
 	local_irq_restore(flags);
 	return err;