mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-01-17 10:26:09 +00:00
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>
This commit is contained in:
parent
575ca7351b
commit
f6c133f7d5
@ -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);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user