Commit 5d84ee79 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 fix from Thomas Gleixner:
 "A single bugfix to prevent irq remapping when the ioapic is disabled"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/apic: Do not init irq remapping if ioapic is disabled
parents 4340393e 2e63ad4b
...@@ -1623,6 +1623,9 @@ void __init enable_IR_x2apic(void) ...@@ -1623,6 +1623,9 @@ void __init enable_IR_x2apic(void)
unsigned long flags; unsigned long flags;
int ret, ir_stat; int ret, ir_stat;
if (skip_ioapic_setup)
return;
ir_stat = irq_remapping_prepare(); ir_stat = irq_remapping_prepare();
if (ir_stat < 0 && !x2apic_supported()) if (ir_stat < 0 && !x2apic_supported())
return; return;
......
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