BogoMIPs is a confusing concept, so allow architectures to print it only if they find it worthwhile. The delay calibration code should stick to lpj and avoid trying to draw any correlation with BogoMIPs, which may be a fixed, bogus (geddit?) value.
Signed-off-by: Will Deacon <[email protected]> --- init/calibrate.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/init/calibrate.c b/init/calibrate.c index fda0a7b..cf48068 100644 --- a/init/calibrate.c +++ b/init/calibrate.c @@ -135,13 +135,13 @@ static unsigned long __cpuinit calibrate_delay_direct(void) if ((measured_times[max] - estimate) < (estimate - measured_times[min])) { printk(KERN_NOTICE "calibrate_delay_direct() dropping " - "min bogoMips estimate %d = %lu\n", + "min delay estimate %d = %lu\n", min, measured_times[min]); measured_times[min] = 0; min = max; } else { printk(KERN_NOTICE "calibrate_delay_direct() dropping " - "max bogoMips estimate %d = %lu\n", + "max delay estimate %d = %lu\n", max, measured_times[max]); measured_times[max] = 0; max = min; @@ -292,9 +292,7 @@ void __cpuinit calibrate_delay(void) } per_cpu(cpu_loops_per_jiffy, this_cpu) = lpj; if (!printed) - pr_cont("%lu.%02lu BogoMIPS (lpj=%lu)\n", - lpj/(500000/HZ), - (lpj/(5000/HZ)) % 100, lpj); + pr_cont("lpj=%lu\n", lpj); loops_per_jiffy = lpj; printed = true; -- 1.8.2.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
