]> nv-tegra.nvidia Code Review - linux-3.10.git/blobdiff - arch/x86_64/kernel/setup.c
[PATCH] x86-64/i386: Revert cpuinfo siblings behaviour back to 2.6.10
[linux-3.10.git] / arch / x86_64 / kernel / setup.c
index e50fc41de6b958a12d1685cbefd3b4607a2a292a..a191d48317895947bdf30aca41f135a4e7dbf7f9 100644 (file)
@@ -1113,8 +1113,12 @@ static int show_cpuinfo(struct seq_file *m, void *v)
                seq_printf(m, "cache size\t: %d KB\n", c->x86_cache_size);
        
 #ifdef CONFIG_SMP
-       seq_printf(m, "physical id\t: %d\n", phys_proc_id[c - cpu_data]);
-       seq_printf(m, "siblings\t: %d\n", c->x86_num_cores * smp_num_siblings);
+       if (smp_num_siblings * c->x86_num_cores > 1) {
+               int cpu = c - cpu_data;
+               seq_printf(m, "physical id\t: %d\n", phys_proc_id[cpu]);
+               seq_printf(m, "siblings\t: %d\n",
+                               c->x86_num_cores * smp_num_siblings);
+       }
 #endif 
 
        seq_printf(m,