diff options
Diffstat (limited to 'init')
| -rw-r--r-- | init/calibrate.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/init/calibrate.c b/init/calibrate.c index fda0a7b0f06c..282a92ae45c6 100644 --- a/init/calibrate.c +++ b/init/calibrate.c @@ -95,7 +95,7 @@ static unsigned long __cpuinit calibrate_delay_direct(void) * >= 12.5% apart, redo calibration. */ if (start >= post_end) - printk(KERN_NOTICE "calibrate_delay_direct() ignoring " + pr_info("calibrate_delay_direct() ignoring " "timer_rate as we had a TSC wrap around" " start=%lu >=post_end=%lu\n", start, post_end); @@ -134,15 +134,13 @@ static unsigned long __cpuinit calibrate_delay_direct(void) good_timer_count = 0; if ((measured_times[max] - estimate) < (estimate - measured_times[min])) { - printk(KERN_NOTICE "calibrate_delay_direct() dropping " - "min bogoMips estimate %d = %lu\n", - min, measured_times[min]); + pr_info("%s() dropping min delay estimate %d = %lu\n", + __func__, 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, measured_times[max]); + pr_info("%s() dropping max delay estimate %d = %lu\n", + __func__, max, measured_times[max]); measured_times[max] = 0; max = min; } @@ -160,7 +158,7 @@ static unsigned long __cpuinit calibrate_delay_direct(void) } - printk(KERN_NOTICE "calibrate_delay_direct() failed to get a good " + pr_info("calibrate_delay_direct() failed to get a good " "estimate for loops_per_jiffy.\nProbably due to long platform " "interrupts. Consider using \"lpj=\" boot option.\n"); return 0; @@ -292,9 +290,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; |