diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-28 10:00:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-28 10:00:21 -0700 |
| commit | 5d84ee7964489acea418122edf54d55f980a0383 (patch) | |
| tree | 6e96f9505f33985d8df5a0c2abc1d5801dfcbaed /arch | |
| parent | 4340393e5a507a9a91bf807a03c73407a1344e20 (diff) | |
| parent | 2e63ad4bd5dd583871e6602f9d398b9322d358d9 (diff) | |
| download | linux-5d84ee7964489acea418122edf54d55f980a0383.tar.gz | |
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
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/apic/apic.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index cea4fc19e844..50c95af0f017 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -1623,6 +1623,9 @@ void __init enable_IR_x2apic(void) unsigned long flags; int ret, ir_stat; + if (skip_ioapic_setup) + return; + ir_stat = irq_remapping_prepare(); if (ir_stat < 0 && !x2apic_supported()) return; |