tree 3a4806ca104fe1807b928d1f85caf69f2dd6f9d8
parent e09b8c0b2006f5e6b543f7458b684d6ebd99e271
author Andi Kleen <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:24:51 -0700
committer Linus Torvalds <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:24:51 -0700
[PATCH] x86-64/i386: Revert cpuinfo siblings behaviour back to 2.6.10
Only display physical id/siblings when there are siblings or dual core.
In 2.6.11 I accidentially broke it and it was always displaying these
fields But for compatibility to all these /proc parsers around it is better
to do it in the old way again.
Noticed by Suresh Siddha
Cc: <[EMAIL PROTECTED]>
Signed-off-by: Andi Kleen <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
i386/kernel/cpu/proc.c | 7 +++++--
x86_64/kernel/setup.c | 8 ++++++--
2 files changed, 11 insertions(+), 4 deletions(-)
Index: arch/i386/kernel/cpu/proc.c
===================================================================
--- 3525a3530308b8d073b7a42e0f46d1b5f7863074/arch/i386/kernel/cpu/proc.c
(mode:100644 sha1:c8d83fdc237a35626d79df5046efffcc37cabf4b)
+++ 3a4806ca104fe1807b928d1f85caf69f2dd6f9d8/arch/i386/kernel/cpu/proc.c
(mode:100644 sha1:89a2956ee657b920ceb3d3f2319a0fa5ffadcc30)
@@ -94,8 +94,11 @@
if (c->x86_cache_size >= 0)
seq_printf(m, "cache size\t: %d KB\n", c->x86_cache_size);
#ifdef CONFIG_X86_HT
- seq_printf(m, "physical id\t: %d\n", phys_proc_id[n]);
- seq_printf(m, "siblings\t: %d\n", c->x86_num_cores * smp_num_siblings);
+ if (c->x86_num_cores * smp_num_siblings > 1) {
+ seq_printf(m, "physical id\t: %d\n", phys_proc_id[n]);
+ seq_printf(m, "siblings\t: %d\n",
+ c->x86_num_cores * smp_num_siblings);
+ }
#endif
/* We use exception 16 if we have hardware math and we've either seen
it or the CPU claims it is internal */
Index: arch/x86_64/kernel/setup.c
===================================================================
--- 3525a3530308b8d073b7a42e0f46d1b5f7863074/arch/x86_64/kernel/setup.c
(mode:100644 sha1:e50fc41de6b958a12d1685cbefd3b4607a2a292a)
+++ 3a4806ca104fe1807b928d1f85caf69f2dd6f9d8/arch/x86_64/kernel/setup.c
(mode:100644 sha1:a191d48317895947bdf30aca41f135a4e7dbf7f9)
@@ -1113,8 +1113,12 @@
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,
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
