Use safe_apic_wait_icr_idle to check ICR idle bit if the vector is NMI_VECTOR to avoid potential hangups in the event of crash when kdump tries to stop the other CPUs. Signed-off-by: Fernando Luis Vazquez Cao <fernando at oss.ntt.co.jp> --- diff -urNp linux-2.6.21-rc7-orig/arch/i386/kernel/smp.c linux-2.6.21-rc7/arch/i386/kernel/smp.c --- linux-2.6.21-rc7-orig/arch/i386/kernel/smp.c 2007-04-23 16:32:58.000000000 +0900 +++ linux-2.6.21-rc7/arch/i386/kernel/smp.c 2007-04-25 19:06:40.000000000 +0900 @@ -175,7 +175,10 @@ static inline void __send_IPI_dest_field /* * 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