diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c
index 890b79cf0e7c311c94e1ce5aa882a5f7f7d4e335..5c80fe3562b7de2436087d433b14c2e9760e4873 100644
--- a/kernel/stop_machine.c
+++ b/kernel/stop_machine.c
@@ -23,6 +23,10 @@
 #include <linux/nmi.h>
 #include <linux/sched/wake_q.h>
 
+#ifdef CONFIG_ARM64
+#include <linux/arm_sdei.h>
+#endif
+
 /*
  * Structure to determine completion condition and record errors.  May
  * be shared by works on different cpus.
@@ -218,6 +222,9 @@ static int multi_cpu_stop(void *data)
 			case MULTI_STOP_DISABLE_IRQ:
 				local_irq_disable();
 				hard_irq_disable();
+#ifdef CONFIG_ARM64
+				sdei_mask_local_cpu();
+#endif
 				break;
 			case MULTI_STOP_RUN:
 				if (is_active)
@@ -238,6 +245,9 @@ static int multi_cpu_stop(void *data)
 		rcu_momentary_dyntick_idle();
 	} while (curstate != MULTI_STOP_EXIT);
 
+#ifdef CONFIG_ARM64
+	sdei_unmask_local_cpu();
+#endif
 	local_irq_restore(flags);
 	return err;
 }