From 5b69a1ac832c00eba8bf26ff02a9f6a153c99c94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fernando=20Luis=20=5B**=20ISO-8859-1=20charset=20**=5D=20V?= =?UTF-8?q?=E1zquezCao?= Date: Wed, 2 May 2007 19:27:18 +0200 Subject: [PATCH] --- yaml --- r: 53902 b: refs/heads/master c: 70ae77f497a57b3ef6b0987b6310327264517cb0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/asm-x86_64/ipi.h | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b35cb38d1972..e99a41135813 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f5efb41e793ce587836b89b7191083b9a6185ed5 +refs/heads/master: 70ae77f497a57b3ef6b0987b6310327264517cb0 diff --git a/trunk/include/asm-x86_64/ipi.h b/trunk/include/asm-x86_64/ipi.h index 26961e671948..a7c75ea408a8 100644 --- a/trunk/include/asm-x86_64/ipi.h +++ b/trunk/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