BogoMIPs is a confusing concept to the ill-informed, 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 value derived from a timer frequency independent of the CPU clock speed.
Acked-by: Nicolas Pitre <n...@linaro.org> Acked-by: Marc Zyngier <marc.zyng...@arm.com> Signed-off-by: Will Deacon <will.dea...@arm.com> --- This is mostly cosmetic, but we've killed bogomips from the cpuinfo on ARM and arm64, so this would be the final nail on the coffin... init/calibrate.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/init/calibrate.c b/init/calibrate.c index 520702d..eabc2ca 100644 --- a/init/calibrate.c +++ b/init/calibrate.c @@ -135,13 +135,13 @@ static unsigned long 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; @@ -295,9 +295,7 @@ void 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 majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/