From eb6296dec19f304199ae389e6863ecc1fc74b7c7 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Mon, 26 Sep 2016 15:48:33 -0400 Subject: [PATCH] x86/apic: Fix silent & fatal merge conflict in __generic_processor_info() Fix up the silent merge conflict between commit c291b0151585 in x86/urgent and commit f7c28833c2520 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 c291b0151585. 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 Reported-by: Mike Galbraith Fixes: 1e1b37273cf7 ("Merge branch 'x86/urgent' into x86/apic") Link: https://lkml.kernel.org/r/alpine.DEB.2.20.1609261350090.5483@nanos Cc: Dou Liyang Signed-off-by: Thomas Gleixner --- arch/x86/kernel/apic/apic.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index 46bb29958509..f266b8a92a9e 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -2171,8 +2171,6 @@ int __generic_processor_info(int apicid, int version, bool enabled) return -ENOSPC; } - num_processors++; - /* * Validate version */ -- 2.20.1