From: Andi Kleen <andi@firstfloor.org>
Date: Fri, 25 Apr 2008 09:45:26 +0000 (+0200)
Subject: fix: x86: support for new UV apic
X-Git-Tag: v2.6.26-rc1~98^2~12
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f6c133f7d5ee3b82f5b34b988e897ea38cd8219c;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

fix: x86: support for new UV apic

Don't warn in read_apic_id() when preemptible but only one CPU online.

Signed-off-by: Andi Kleen <andi@firstfloor.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---

diff --git a/arch/x86/kernel/genapic_64.c b/arch/x86/kernel/genapic_64.c
index 021624c..cbaaf69 100644
--- a/arch/x86/kernel/genapic_64.c
+++ b/arch/x86/kernel/genapic_64.c
@@ -83,7 +83,7 @@ unsigned int read_apic_id(void)
 {
 	unsigned int id;
 
-	WARN_ON(preemptible());
+	WARN_ON(preemptible() && num_online_cpus() > 1);
 	id = apic_read(APIC_ID);
 	if (uv_system_type >= UV_X2APIC)
 		id  |= __get_cpu_var(x2apic_extra_bits);