diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2005-11-11 15:48:56 -0500 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2005-11-11 15:48:56 -0500 |
| commit | 4d45cbacb8488ae3172065e4fca608079492231b (patch) | |
| tree | db8c485e2837185487aecbd46d27205dbc9e7536 /arch/sparc64/kernel/smp.c | |
| parent | 388f7ef720a982f49925e7b4e96f216f208f8c03 (diff) | |
[SPARC64]: Restore 2.4.x /proc/cpuinfo behavior for "ncpus probed" field.
Noticed by Tom 'spot' Callaway.
Even on uniprocessor we always reported the number of physical
cpus in the system via /proc/cpuinfo. But when this got changed
to use num_possible_cpus() it always reads as "1" on uniprocessor.
This change was unintentional.
So scan the firmware device tree and count the number of cpu
nodes, and report that, as we always did.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc64/kernel/smp.c')
| -rw-r--r-- | arch/sparc64/kernel/smp.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sparc64/kernel/smp.c b/arch/sparc64/kernel/smp.c index 797a65493fb8..6efc03df51c3 100644 --- a/arch/sparc64/kernel/smp.c +++ b/arch/sparc64/kernel/smp.c | |||
| @@ -39,7 +39,6 @@ | |||
| 39 | #include <asm/starfire.h> | 39 | #include <asm/starfire.h> |
| 40 | #include <asm/tlb.h> | 40 | #include <asm/tlb.h> |
| 41 | 41 | ||
| 42 | extern int linux_num_cpus; | ||
| 43 | extern void calibrate_delay(void); | 42 | extern void calibrate_delay(void); |
| 44 | 43 | ||
| 45 | /* Please don't make this stuff initdata!!! --DaveM */ | 44 | /* Please don't make this stuff initdata!!! --DaveM */ |