1 files changed, 4 insertions, 1 deletions

diff --git a/include/asm-x86_64/ipi.h b/include/asm-x86_64/ipi.h
index 26961e671948..a7c75ea408a8 100644
--- a/include/asm-x86_64/ipi.h
+++ b/include/asm-x86_64/ipi.h
@@ -85,7 +85,10 @@ static inline void __send_IPI_dest_field(unsigned int mask, int vector, unsigned
         /*
          * Wait for idle.
          */
-        apic_wait_icr_idle();
+        if (unlikely(vector == NMI_VECTOR))
+                safe_apic_wait_icr_idle();
+        else
+                apic_wait_icr_idle();
 
         /*
          * prepare target chip field