Cc: Paul Gortmaker <paul.gortma...@windriver.com> Cc: Andrew Morton <a...@linux-foundation.org> Signed-off-by: Fabian Frederick <f...@skynet.be> --- V2: add 'Signed-off-by'
init/calibrate.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/init/calibrate.c b/init/calibrate.c index 520702d..0d747bb 100644 --- a/init/calibrate.c +++ b/init/calibrate.c @@ -95,10 +95,8 @@ static unsigned long calibrate_delay_direct(void) * >= 12.5% apart, redo calibration. */ if (start >= post_end) - printk(KERN_NOTICE "calibrate_delay_direct() ignoring " - "timer_rate as we had a TSC wrap around" - " start=%lu >=post_end=%lu\n", - start, post_end); + pr_notice("calibrate_delay_direct() ignoring timer_rate as we had a TSC wrap around start=%lu >=post_end=%lu\n", + start, post_end); if (start < post_end && pre_start != 0 && pre_end != 0 && (timer_rate_max - timer_rate_min) < (timer_rate_max >> 3)) { good_timer_count++; @@ -134,15 +132,13 @@ static unsigned long 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_notice("calibrate_delay_direct() dropping min bogoMips 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, measured_times[max]); + pr_notice("calibrate_delay_direct() dropping max bogoMips estimate %d = %lu\n", + max, measured_times[max]); measured_times[max] = 0; max = min; } @@ -160,9 +156,8 @@ static unsigned long calibrate_delay_direct(void) } - printk(KERN_NOTICE "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"); + pr_notice("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; } #else -- 1.9.1 -- 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/