---

yaml --- r: 295232 b: refs/heads/master c: 8595c53 h: refs/heads/master v: v3
git-mirror · Mar 23, 2012 · 7f37632 · 7f37632
1 parent 47df4a3
commit 7f37632
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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;