diff options
| author | Emeric Brun <emeric@exceliance.fr> | 2008-09-07 17:27:56 +0200 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2008-09-07 17:29:40 +0200 |
| commit | 7f3abb1813d6275f82335369254bb5eecc346510 (patch) | |
| tree | 01998f10777bfa961cb9b5f1413a9bbd2278101a | |
| parent | 71cb18be1f37e995e6158d1c9a1226a4c84a2718 (diff) | |
| download | linux-2.4-7f3abb1813d6275f82335369254bb5eecc346510.tar.gz | |
x86 SMP: don't report error on uniprocessor machines
Booting i386 on an SMP system with only one processor reports
the following error :
Error: only one processor found.
This has always caused unnecessary worries to admins, and is
getting more frequent nowadays on virtual machines. The solution
simply consists in removing the cpucount test, which does not
exist anymore in 2.6 BTW. A boot on a quad-core "downcored"
to 1 core now correctly reports :
Total of 1 processors activated (6003.09 BogoMIPS).
Ditto for x86_64.
Signed-off-by: Willy Tarreau <w@1wt.eu>
| -rw-r--r-- | arch/i386/kernel/smpboot.c | 4 | ||||
| -rw-r--r-- | arch/x86_64/kernel/smpboot.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/arch/i386/kernel/smpboot.c b/arch/i386/kernel/smpboot.c index 7a66b02201e224..7c211aec991ced 100644 --- a/arch/i386/kernel/smpboot.c +++ b/arch/i386/kernel/smpboot.c @@ -1146,9 +1146,7 @@ void __init smp_boot_cpus(void) */ Dprintk("Before bogomips.\n"); - if (!cpucount) { - printk(KERN_ERR "Error: only one processor found.\n"); - } else { + { unsigned long bogosum = 0; for (cpu = 0; cpu < NR_CPUS; cpu++) if (cpu_online_map & (1<<cpu)) diff --git a/arch/x86_64/kernel/smpboot.c b/arch/x86_64/kernel/smpboot.c index 99db1bbdc57983..74b41836909921 100644 --- a/arch/x86_64/kernel/smpboot.c +++ b/arch/x86_64/kernel/smpboot.c @@ -964,9 +964,7 @@ void __init smp_boot_cpus(void) */ Dprintk("Before bogomips.\n"); - if (!cpucount) { - printk(KERN_ERR "Only one processor found.\n"); - } else { + { unsigned long bogosum = 0; for (cpu = 0; cpu < NR_CPUS; cpu++) if (cpu_online_map & (1<<cpu)) |