diff options
author | Andi Kleen <andi@firstfloor.org> | 2008-04-25 05:45:26 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-04-30 17:15:34 -0400 |
commit | f6c133f7d5ee3b82f5b34b988e897ea38cd8219c (patch) | |
tree | 42e916ab4b15d4a14e58545c7e1a6394c781bff4 | |
parent | 575ca7351bf0546919060071797cccb4a05960df (diff) |
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 021624c8358..cbaaf69bedb 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) | |||
83 | { | 83 | { |
84 | unsigned int id; | 84 | unsigned int id; |
85 | 85 | ||
86 | WARN_ON(preemptible()); | 86 | WARN_ON(preemptible() && num_online_cpus() > 1); |
87 | id = apic_read(APIC_ID); | 87 | id = apic_read(APIC_ID); |
88 | if (uv_system_type >= UV_X2APIC) | 88 | if (uv_system_type >= UV_X2APIC) |
89 | id |= __get_cpu_var(x2apic_extra_bits); | 89 | id |= __get_cpu_var(x2apic_extra_bits); |