aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/apic/apic.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2016-09-26 15:47:03 -0400
committerThomas Gleixner <tglx@linutronix.de>2016-09-26 15:47:03 -0400
commit1e1b37273cf719545da50b76f214f983a710aaf4 (patch)
tree033f6062325ef7aaeefe8559bb409ab7d2be3c76 /arch/x86/kernel/apic/apic.c
parentc183a603e8d8a5a189729b77d0c623a3d5950e5f (diff)
parentc291b015158577be533dd5a959dfc09bab119eed (diff)
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/apic.c')
-rw-r--r--arch/x86/kernel/apic/apic.c5
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)
1624 unsigned long flags; 1624 unsigned long flags;
1625 int ret, ir_stat; 1625 int ret, ir_stat;
1626 1626
1627 if (skip_ioapic_setup)
1628 return;
1629
1627 ir_stat = irq_remapping_prepare(); 1630 ir_stat = irq_remapping_prepare();
1628 if (ir_stat < 0 && !x2apic_supported()) 1631 if (ir_stat < 0 && !x2apic_supported())
1629 return; 1632 return;
@@ -2168,6 +2171,8 @@ int __generic_processor_info(int apicid, int version, bool enabled)
2168 return -ENOSPC; 2171 return -ENOSPC;
2169 } 2172 }
2170 2173
2174 num_processors++;
2175
2171 /* 2176 /*
2172 * Validate version 2177 * Validate version
2173 */ 2178 */