diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2016-09-26 21:47:03 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-09-26 21:47:03 +0200 |
| commit | 1e1b37273cf719545da50b76f214f983a710aaf4 (patch) | |
| tree | 033f6062325ef7aaeefe8559bb409ab7d2be3c76 /arch/x86/kernel/apic | |
| parent | acpi: Fix broken error check in map_processor() (diff) | |
| parent | x86/apic: Fix num_processors value in case of failure (diff) | |
| download | linux-1e1b37273cf719545da50b76f214f983a710aaf4.tar.xz linux-1e1b37273cf719545da50b76f214f983a710aaf4.zip | |
Merge branch 'x86/urgent' into x86/apic
Bring in the upstream modifications so we can fixup the silent merge
conflict which is introduced by this merge.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/apic')
| -rw-r--r-- | arch/x86/kernel/apic/apic.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index 2dc01c38ad8e..46bb29958509 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -1624,6 +1624,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; @@ -2168,6 +2171,8 @@ int __generic_processor_info(int apicid, int version, bool enabled) return -ENOSPC; } + num_processors++; + /* * Validate version */ |