Commit f6c133f7 authored by Andi Kleen's avatar Andi Kleen Committed by Ingo Molnar

fix: x86: support for new UV apic

Don't warn in read_apic_id() when preemptible but only one CPU online.
Signed-off-by: default avatarAndi Kleen <andi@firstfloor.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 575ca735
...@@ -83,7 +83,7 @@ unsigned int read_apic_id(void) ...@@ -83,7 +83,7 @@ unsigned int read_apic_id(void)
{ {
unsigned int id; unsigned int id;
WARN_ON(preemptible()); WARN_ON(preemptible() && num_online_cpus() > 1);
id = apic_read(APIC_ID); id = apic_read(APIC_ID);
if (uv_system_type >= UV_X2APIC) if (uv_system_type >= UV_X2APIC)
id |= __get_cpu_var(x2apic_extra_bits); id |= __get_cpu_var(x2apic_extra_bits);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment