The patch titled x86: fix wrong /proc/cpuinfo has been added to the -mm tree. Its filename is fix-wrong-proc-cpuinfo-on-x64.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: x86: fix wrong /proc/cpuinfo From: Zou Nan hai <nanhai.zou@xxxxxxxxx> in 2.6.24-rc1 kernel, The /proc/cpuinfo display is wrong. Another issue is that it will display bogus cpus with wrong information if the kernel is compiled with a big CONFIG_NR_CPU. That is because before a cpu in cpu_present_map is up, c->cpu_index of that cpu is 0. thus the cpu_online(c->cpu_index) check in show_cpuinfo is invalid. This patch will let cpuinfo_op use cpu_online_map instead of cpu_present_map to iterate cpus. Signed-off-by: Zou Nan hai <nanhai.zou@xxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/x86/kernel/setup_64.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff -puN arch/x86/kernel/setup_64.c~fix-wrong-proc-cpuinfo-on-x64 arch/x86/kernel/setup_64.c --- a/arch/x86/kernel/setup_64.c~fix-wrong-proc-cpuinfo-on-x64 +++ a/arch/x86/kernel/setup_64.c @@ -1131,8 +1131,6 @@ static int show_cpuinfo(struct seq_file #ifdef CONFIG_SMP - if (!cpu_online(c->cpu_index)) - return 0; cpu = c->cpu_index; #endif @@ -1224,15 +1222,15 @@ 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); } _ Patches currently in -mm which might be from nanhai.zou@xxxxxxxxx are origin.patch fix-wrong-proc-cpuinfo-on-x64.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html