1 files changed, 3 insertions, 6 deletions

diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c
index 238633d3d09a..30d94d1d5f5f 100644
--- a/arch/x86/kernel/setup_64.c
+++ b/arch/x86/kernel/setup_64.c
@@ -892,7 +892,6 @@ void __cpuinit early_identify_cpu(struct cpuinfo_x86 *c)
 
 #ifdef CONFIG_SMP
         c->phys_proc_id = (cpuid_ebx(1) >> 24) & 0xff;
-        c->cpu_index = 0;
 #endif
 }
 
@@ -1078,8 +1077,6 @@ static int show_cpuinfo(struct seq_file *m, void *v)
 
 
 #ifdef CONFIG_SMP
-        if (!cpu_online(c->cpu_index))
-                return 0;
         cpu = c->cpu_index;
 #endif
 
@@ -1171,15 +1168,15 @@ static int show_cpuinfo(struct seq_file *m, void *v)
 static void *c_start(struct seq_file *m, loff_t *pos)
 {
         if (*pos == 0)  /* just in case, cpu 0 is not the first */
-                *pos = first_cpu(cpu_possible_map);
-        if ((*pos) < NR_CPUS && cpu_possible(*pos))
+                *pos = first_cpu(cpu_online_map);
+        if ((*pos) < NR_CPUS && cpu_online(*pos))
                 return &cpu_data(*pos);
         return NULL;
 }
 
 static void *c_next(struct seq_file *m, void *v, loff_t *pos)
 {
-        *pos = next_cpu(*pos, cpu_possible_map);
+        *pos = next_cpu(*pos, cpu_online_map);
         return c_start(m, pos);
 }