summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorDiwakar Tundlam <dtundlam@nvidia.com>2012-03-23 15:02:28 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-23 16:58:38 -0700
commit8595c539f0360477189eef91f6337ba44962f72d (patch)
treeb04493a7c330b2ba6f4a9a418890872a70104459 /init
parentda0503aae07f0410b6ff0a9e1d1d011701eb2758 (diff)
downloadlinux-8595c539f0360477189eef91f6337ba44962f72d.tar.gz
linux-8595c539f0360477189eef91f6337ba44962f72d.tar.bz2
linux-8595c539f0360477189eef91f6337ba44962f72d.zip
init: check printed flag to skip printing message
Otherwise the 'Calibration skipped' message gets printed everytime a CPU is hotplugged in, cluttering console for systems that frequently hotplug CPUs. Signed-off-by: Diwakar Tundlam <dtundlam@nvidia.com> Cc: Phil Carmody <ext-phil.2.carmody@nokia.com> Cc: Russell King <rmk+kernel@arm.linux.org.uk> Cc: Greg KH <greg@kroah.com> Cc: Sameer Nanda <snanda@chromium.org> Cc: Peter De Schrijver <pdeschrijver@nvidia.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'init')
-rw-r--r--init/calibrate.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/init/calibrate.c b/init/calibrate.c
index 5f117ca9e069..fda0a7b0f06c 100644
--- 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;