From 16302f7ab3810e179178a63127478ab2475c7f42 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: 53901 b: refs/heads/master c: f5efb41e793ce587836b89b7191083b9a6185ed5 h: refs/heads/master i: 53899: ea58ab10da7fa58aba4c673096b1e029a6f33187 v: v3 --- [refs] | 2 +- trunk/arch/i386/kernel/smp.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 69692f2fa15a..b35cb38d1972 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9062d888aa448318e38792b6879a795dd10adda4 +refs/heads/master: f5efb41e793ce587836b89b7191083b9a6185ed5 diff --git a/trunk/arch/i386/kernel/smp.c b/trunk/arch/i386/kernel/smp.c index d14ffe2109b8..f8667109db1c 100644 --- a/trunk/arch/i386/kernel/smp.c +++ b/trunk/arch/i386/kernel/smp.c @@ -175,7 +175,10 @@ static inline void __send_IPI_dest_field(unsigned long mask, int vector) /* * 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