diff --git a/[refs] b/[refs] index a26d070015f9..93ce2c2e962d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: da0503aae07f0410b6ff0a9e1d1d011701eb2758 +refs/heads/master: 8595c539f0360477189eef91f6337ba44962f72d diff --git a/trunk/init/calibrate.c b/trunk/init/calibrate.c index 5f117ca9e069..fda0a7b0f06c 100644 --- a/trunk/init/calibrate.c +++ b/trunk/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;