aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2005-10-28 14:33:35 -0700
committerTony Luck <tony.luck@intel.com>2005-10-28 14:33:35 -0700
commit5a2b1722e1051b84485a77006abe9b929aedef32 (patch)
tree0f61eff618b22c698a97563c881ccea271464a0b /arch
parent1e1bb25e97dcbc8820e673eb543be6b2dcfa080b (diff)
parentce6e71ad4866dad366be135b024b776c00ec9ec8 (diff)
Pull proc-cpuinfo-siblings into release branch
Diffstat (limited to 'arch')
-rw-r--r--arch/ia64/kernel/setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index f95fd276663..fc56ca2da35 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -561,7 +561,7 @@ show_cpuinfo (struct seq_file *m, void *v)
c->itc_freq / 1000000, c->itc_freq % 1000000,
lpj*HZ/500000, (lpj*HZ/5000) % 100);
#ifdef CONFIG_SMP
- seq_printf(m, "siblings : %u\n", c->num_log);
+ seq_printf(m, "siblings : %u\n", cpus_weight(cpu_core_map[cpunum]));
if (c->threads_per_core > 1 || c->cores_per_socket > 1)
seq_printf(m,
"physical id: %u\n"