diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-10-28 17:33:35 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-10-28 17:33:35 -0400 |
| commit | 5a2b1722e1051b84485a77006abe9b929aedef32 (patch) | |
| tree | 0f61eff618b22c698a97563c881ccea271464a0b | |
| parent | 1e1bb25e97dcbc8820e673eb543be6b2dcfa080b (diff) | |
| parent | ce6e71ad4866dad366be135b024b776c00ec9ec8 (diff) | |
Pull proc-cpuinfo-siblings into release branch
| -rw-r--r-- | arch/ia64/kernel/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c index f95fd2766634..fc56ca2da358 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) | |||
| 561 | c->itc_freq / 1000000, c->itc_freq % 1000000, | 561 | c->itc_freq / 1000000, c->itc_freq % 1000000, |
| 562 | lpj*HZ/500000, (lpj*HZ/5000) % 100); | 562 | lpj*HZ/500000, (lpj*HZ/5000) % 100); |
| 563 | #ifdef CONFIG_SMP | 563 | #ifdef CONFIG_SMP |
| 564 | seq_printf(m, "siblings : %u\n", c->num_log); | 564 | seq_printf(m, "siblings : %u\n", cpus_weight(cpu_core_map[cpunum])); |
| 565 | if (c->threads_per_core > 1 || c->cores_per_socket > 1) | 565 | if (c->threads_per_core > 1 || c->cores_per_socket > 1) |
| 566 | seq_printf(m, | 566 | seq_printf(m, |
| 567 | "physical id: %u\n" | 567 | "physical id: %u\n" |