leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
110a9e42b6
linux/arch/x86/kernel/apic
History
Thomas Gleixner eb6296dec1 x86/apic: Fix silent & fatal merge conflict in __generic_processor_info() 
Fix up the silent merge conflict between commit c291b01515 in x86/urgent
and commit f7c28833c2 in x86/apic which both remove num_processors++
from the original location and then add it at two different locations. As a
result num_processors is incremented twice which can cut the number of
available cpus in half.

Remove the one which is added by commit c291b01515.

In hindsight I should have merged x86/urgent into x86/apic _before_ adding
the nodeid bits, but in hindsight we are always smarter.

Reported-and-tested-by: Borislav Petkov <bp@alien8.de>
Reported-by: Mike Galbraith <umgwanakikbuti@gmail.com>
Fixes: 1e1b37273c ("Merge branch 'x86/urgent' into x86/apic")
Link: https://lkml.kernel.org/r/alpine.DEB.2.20.1609261350090.5483@nanos
Cc: Dou Liyang <douly.fnst@cn.fujitsu.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2016-09-26 15:51:22 -04:00
..
apic_flat_64.c Merge branch 'x86-headers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2016-08-01 14:23:42 -04:00
apic_noop.c Merge branch 'x86-headers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2016-08-01 14:23:42 -04:00
apic_numachip.c x86/apic: Remove the unused struct apic::apic_id_mask field 2016-07-15 10:39:05 +02:00
apic.c x86/apic: Fix silent & fatal merge conflict in __generic_processor_info() 2016-09-26 15:51:22 -04:00
bigsmp_32.c x86/apic: Remove the unused struct apic::apic_id_mask field 2016-07-15 10:39:05 +02:00
htirq.c x86: Constify irqdomain ops 2015-05-05 11:14:48 +02:00
hw_nmi.c x86/kernel: Audit and remove any unnecessary uses of module.h 2016-07-14 15:06:41 +02:00
io_apic.c x86/apic: Get rid of apic_version[] array 2016-09-20 00:31:19 +02:00
ipi.c x86/kernel: Audit and remove any unnecessary uses of module.h 2016-07-14 15:06:41 +02:00
Makefile kernel: add kcov code coverage 2016-03-22 15:36:02 -07:00
msi.c x86/irq: Export functions to allow MSI domains in modules 2015-12-20 12:40:49 +01:00
probe_32.c x86/apic: Get rid of apic_version[] array 2016-09-20 00:31:19 +02:00
probe_64.c x86/apic: Remove duplicated include from probe_64.c 2016-07-19 16:02:31 +02:00
vector.c tree-wide: replace config_enabled() with IS_ENABLED() 2016-08-04 08:50:07 -04:00
x2apic_cluster.c x86/apic/x2apic, smp/hotplug: Don't use before alloc in x2apic_cluster_probe() 2016-08-11 16:35:50 +02:00
x2apic_phys.c x86/apic: Remove the unused struct apic::apic_id_mask field 2016-07-15 10:39:05 +02:00
x2apic_uv_x.c x86/platform/UV: Fix kernel panic running RHEL kdump kernel on UV systems 2016-08-10 15:55:39 +02:00