From: "Andreas Herrmann" Fix regressions introduced with 92cb7612aee39642d109b8d935ad265e602c0563. It can happen that cpuinfo is displayed for CPUs that are not online or even worse for CPUs not present at all. As an example, following was shown for a "second" CPU of a single core K8 variant: processor : 0 vendor_id : unknown cpu family : 0 model : 0 model name : unknown stepping : 0 cache size : 0 KB fpu : yes fpu_exception : yes cpuid level : 0 wp : yes flags : bogomips : 0.00 clflush size : 0 cache_alignment : 0 address sizes : 0 bits physical, 0 bits virtual power management: Signed-off-by: Andreas Herrmann Cc: Glauber de Oliveira Costa Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Mike Travis Signed-off-by: Andrew Morton --- arch/x86/kernel/cpu/proc.c | 8 +++----- x86/kernel/setup_64.c | 0 2 files changed, 3 insertions(+), 5 deletions(-) diff -puN arch/x86/kernel/cpu/proc.c~x86-show-cpuinfo-only-for-online-cpus arch/x86/kernel/cpu/proc.c --- a/arch/x86/kernel/cpu/proc.c~x86-show-cpuinfo-only-for-online-cpus +++ a/arch/x86/kernel/cpu/proc.c @@ -90,8 +90,6 @@ static int show_cpuinfo(struct seq_file #ifdef CONFIG_SMP n = c->cpu_index; - if (!cpu_online(n)) - return 0; #endif seq_printf(m, "processor\t: %d\n" "vendor_id\t: %s\n" @@ -177,14 +175,14 @@ static int show_cpuinfo(struct seq_file 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); } static void c_stop(struct seq_file *m, void *v) diff -puN arch/x86/kernel/setup_64.c~x86-show-cpuinfo-only-for-online-cpus arch/x86/kernel/setup_64.c _