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 <[email protected]>
Reported-by: Mike Galbraith <[email protected]>
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 <[email protected]>
Signed-off-by: Thomas Gleixner <[email protected]>

diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 46bb29958509864784872d99299b6b569a6e5a2c..f266b8a92a9e08d89ea0fe876770b10b5bb1235f 100644 (file)
--- 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
         */