Merge branch 'for-3.4'

[linux.git] / init / calibrate.c

diff --git a/init/calibrate.c b/init/calibrate.c
index 5f117ca9e0694488765ed0d4c0ea70baae7e6a04..fda0a7b0f06c006467c43d04f658744b146a6266 100644 (file)
--- a/init/calibrate.c
+++ b/init/calibrate.c
@@ -267,7 +267,8 @@ void __cpuinit calibrate_delay(void)
 
        if (per_cpu(cpu_loops_per_jiffy, this_cpu)) {
                lpj = per_cpu(cpu_loops_per_jiffy, this_cpu);
-               pr_info("Calibrating delay loop (skipped) "
+               if (!printed)
+                       pr_info("Calibrating delay loop (skipped) "
                                "already calibrated this CPU");
        } else if (preset_lpj) {
                lpj = preset_lpj;