diff options
| author | Andi Kleen <andi@firstfloor.org> | 2008-04-25 11:45:26 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-04-30 23:15:34 +0200 |
| commit | f6c133f7d5ee3b82f5b34b988e897ea38cd8219c (patch) | |
| tree | 42e916ab4b15d4a14e58545c7e1a6394c781bff4 | |
| parent | x86: fix early-BUG message (diff) | |
| download | linux-f6c133f7d5ee3b82f5b34b988e897ea38cd8219c.tar.xz linux-f6c133f7d5ee3b82f5b34b988e897ea38cd8219c.zip | |
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>
| -rw-r--r-- | arch/x86/kernel/genapic_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/genapic_64.c b/arch/x86/kernel/genapic_64.c index 021624c83583..cbaaf69bedb2 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); |