Merge branches 'softirq-for-linus', 'x86-debug-for-linus', 'x86-numa-for-linus',...

[~shefty/rdma-dev.git] / arch / x86 / kernel / cpu / intel.c

diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
index 6d61786c2dd50c3f91bb9707bd604b1d08f8c8fe..d16c2c53d6bff0504595f5f0c93a973ad76248b9 100644 (file)
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@ -170,7 +170,7 @@ static void __cpuinit intel_smp_check(struct cpuinfo_x86 *c)
 {
 #ifdef CONFIG_SMP
        /* calling is from identify_secondary_cpu() ? */
 {
 #ifdef CONFIG_SMP
        /* calling is from identify_secondary_cpu() ? */

-       if (c->cpu_index == boot_cpu_id)
+       if (!c->cpu_index)

                return;
 
        /*
                return;
 
        /*