diff options
author | Glauber de Oliveira Costa <gcosta@redhat.com> | 2008-03-19 13:25:29 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 11:41:01 -0400 |
commit | f68e00a32b4f5a2881c3a39d71cc2c22e92f1d99 (patch) | |
tree | 5cf8e7cc674b388c15d211b0433313ffb0f9000e /arch/x86/kernel/smpboot.c | |
parent | 693d4b8a6429af7f2029df20a59e22f4d752e141 (diff) |
x86: move impress_friends and smp_check to cpus_done
the cpu count is changed accordingly: now, what matters is
online cpus.
Also, we add those functions for x86_64
Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/smpboot.c')
-rw-r--r-- | arch/x86/kernel/smpboot.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index ddb94ef37789..6978f1bf6533 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c | |||
@@ -114,7 +114,7 @@ void smp_checks(void) | |||
114 | * approved Athlon | 114 | * approved Athlon |
115 | */ | 115 | */ |
116 | if (tainted & TAINT_UNSAFE_SMP) { | 116 | if (tainted & TAINT_UNSAFE_SMP) { |
117 | if (cpus_weight(cpu_present_map)) | 117 | if (num_online_cpus()) |
118 | printk(KERN_INFO "WARNING: This combination of AMD" | 118 | printk(KERN_INFO "WARNING: This combination of AMD" |
119 | "processors is not suitable for SMP.\n"); | 119 | "processors is not suitable for SMP.\n"); |
120 | else | 120 | else |
@@ -258,7 +258,7 @@ void impress_friends(void) | |||
258 | bogosum += cpu_data(cpu).loops_per_jiffy; | 258 | bogosum += cpu_data(cpu).loops_per_jiffy; |
259 | printk(KERN_INFO | 259 | printk(KERN_INFO |
260 | "Total of %d processors activated (%lu.%02lu BogoMIPS).\n", | 260 | "Total of %d processors activated (%lu.%02lu BogoMIPS).\n", |
261 | cpus_weight(cpu_present_map), | 261 | num_online_cpus(), |
262 | bogosum/(500000/HZ), | 262 | bogosum/(500000/HZ), |
263 | (bogosum/(5000/HZ))%100); | 263 | (bogosum/(5000/HZ))%100); |
264 | 264 | ||