remove bogus UP on SMP kernel error
PATCH 1/1 remove bogus UP on SMP kernel error
This patch 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.
arch/i386/kernel/smpboot.c renamed from arch/i386/kernel/smpboot.c.orig +15 -15
@@ -937,6 +937,7 @@ int cpu_sibling_map[NR_CPUS] __cachelinestatic void __init smp_boot_cpus (unsigned int max_cpus) {int apicid, cpu, bit, kicked; +unsigned long bogosum =0 ;/* * Setup boot CPU information
@@ -1048,26 +1049,25 @@ static void __init smp_boot_cpus(unsigne/* * Allow the user to impress friends. */ -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_isset (cpu, cpu_callout_map)) - bogosum += cpu_data[cpu].loops_per_jiffy; -printk (KERN_INFO "Total of %d processors activated (%lu.%02lu BogoMIPS).\n" , - cpucount+1 , - bogosum/(500000 /HZ ), - (bogosum/(5000 /HZ ))%100 ); -Dprintk ("Before bogocount - setting activated=1.\n" ); - } +for (cpu =0 ; cpu <NR_CPUS ; cpu++) +if (cpu_isset (cpu, cpu_callout_map)) + bogosum += cpu_data[cpu].loops_per_jiffy; +printk (KERN_INFO +"Total of %d processors activated (%lu.%02lu BogoMIPS).\n" , + cpucount+1 , + bogosum/(500000 /HZ ), + (bogosum/(5000 /HZ ))%100 ); + +Dprintk ("Before bogocount - setting activated=1.\n" );if (smp_b_stepping)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 (cpucount)printk (KERN_INFO "WARNING: This combination of AMD processors is not suitable for SMP.\n" );