Commit cf46e949 authored by Nick Piggin's avatar Nick Piggin Committed by Linus Torvalds

[PATCH] remove bogus UP on SMP kernel error

This removes a bogus error message in the bogomips reporting code when
running an SMP kernel on UP.  It makes the output consistent with what
you see on an SMP box.  I noticed this while testing, but it recently
annoyed me again when booting a knoppix CD - its the first line you'll
see.
parent e9d827f7
...@@ -937,6 +937,7 @@ int cpu_sibling_map[NR_CPUS] __cacheline_aligned; ...@@ -937,6 +937,7 @@ int cpu_sibling_map[NR_CPUS] __cacheline_aligned;
static void __init smp_boot_cpus(unsigned int max_cpus) static void __init smp_boot_cpus(unsigned int max_cpus)
{ {
int apicid, cpu, bit, kicked; int apicid, cpu, bit, kicked;
unsigned long bogosum = 0;
/* /*
* Setup boot CPU information * Setup boot CPU information
...@@ -1048,26 +1049,25 @@ static void __init smp_boot_cpus(unsigned int max_cpus) ...@@ -1048,26 +1049,25 @@ static void __init smp_boot_cpus(unsigned int max_cpus)
/* /*
* Allow the user to impress friends. * Allow the user to impress friends.
*/ */
Dprintk("Before bogomips.\n"); Dprintk("Before bogomips.\n");
if (!cpucount) { for (cpu = 0; cpu < NR_CPUS; cpu++)
printk(KERN_ERR "Error: only one processor found.\n"); if (cpu_isset(cpu, cpu_callout_map))
} else { bogosum += cpu_data[cpu].loops_per_jiffy;
unsigned long bogosum = 0; printk(KERN_INFO
for (cpu = 0; cpu < NR_CPUS; cpu++) "Total of %d processors activated (%lu.%02lu BogoMIPS).\n",
if (cpu_isset(cpu, cpu_callout_map)) cpucount+1,
bogosum += cpu_data[cpu].loops_per_jiffy; bogosum/(500000/HZ),
printk(KERN_INFO "Total of %d processors activated (%lu.%02lu BogoMIPS).\n", (bogosum/(5000/HZ))%100);
cpucount+1,
bogosum/(500000/HZ), Dprintk("Before bogocount - setting activated=1.\n");
(bogosum/(5000/HZ))%100);
Dprintk("Before bogocount - setting activated=1.\n");
}
if (smp_b_stepping) if (smp_b_stepping)
printk(KERN_WARNING "WARNING: SMP operation may be unreliable with B stepping processors.\n"); printk(KERN_WARNING "WARNING: SMP operation may be unreliable with B stepping processors.\n");
/* Don't taint if we are running SMP kernel on a single non-MP approved Athlon */ /*
* Don't taint if we are running SMP kernel on a single non-MP
* approved Athlon
*/
if (tainted & TAINT_UNSAFE_SMP) { if (tainted & TAINT_UNSAFE_SMP) {
if (cpucount) if (cpucount)
printk (KERN_INFO "WARNING: This combination of AMD processors is not suitable for SMP.\n"); printk (KERN_INFO "WARNING: This combination of AMD processors is not suitable for SMP.\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment