Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  timers, init: Limit the number of per cpu calibration bootup messages
  posix-cpu-timers: optimize and document timer_create callback
  clockevents: Add missing include to pacify sparse
  x86: vmiclock: Fix printk format
  x86: Fix printk format due to variable type change
  sparc: fix printk for change of variable type
  clocksource/events: Fix fallout of generic code changes
  nohz: Allow 32-bit machines to sleep for more than 2.15 seconds
  nohz: Track last do_timer() cpu
  nohz: Prevent clocksource wrapping during idle
  nohz: Type cast printk argument
  mips: Use generic mult/shift factor calculation for clocks
  clocksource: Provide a generic mult/shift factor calculation
  clockevents: Use u32 for mult and shift factors
  nohz: Introduce arch_needs_cpu
  nohz: Reuse ktime in sub-functions of tick_check_idle.
  time: Remove xtime_cache
  time: Implement logarithmic time accumulation

1 files changed, 15 insertions, 9 deletions

diff --git a/init/calibrate.c b/init/calibrate.c
index a379c906119..6eb48e53d61 100644
--- a/init/calibrate.c
+++ b/init/calibrate.c
@@ -123,23 +123,26 @@ void __cpuinit calibrate_delay(void)
 {
         unsigned long ticks, loopbit;
         int lps_precision = LPS_PREC;
+        static bool printed;
 
         if (preset_lpj) {
                 loops_per_jiffy = preset_lpj;
-                printk(KERN_INFO
-                        "Calibrating delay loop (skipped) preset value.. ");
-        } else if ((smp_processor_id() == 0) && lpj_fine) {
+                if (!printed)
+                        pr_info("Calibrating delay loop (skipped) "
+                                "preset value.. ");
+        } else if ((!printed) && lpj_fine) {
                 loops_per_jiffy = lpj_fine;
-                printk(KERN_INFO
-                        "Calibrating delay loop (skipped), "
+                pr_info("Calibrating delay loop (skipped), "
                         "value calculated using timer frequency.. ");
         } else if ((loops_per_jiffy = calibrate_delay_direct()) != 0) {
-                printk(KERN_INFO
-                        "Calibrating delay using timer specific routine.. ");
+                if (!printed)
+                        pr_info("Calibrating delay using timer "
+                                "specific routine.. ");
         } else {
                 loops_per_jiffy = (1<<12);
 
-                printk(KERN_INFO "Calibrating delay loop... ");
+                if (!printed)
+                        pr_info("Calibrating delay loop... ");
                 while ((loops_per_jiffy <<= 1) != 0) {
                         /* wait for "start of" clock tick */
                         ticks = jiffies;
@@ -170,7 +173,10 @@ void __cpuinit calibrate_delay(void)
                                 loops_per_jiffy &= ~loopbit;
                 }
         }
-        printk(KERN_CONT "%lu.%02lu BogoMIPS (lpj=%lu)\n",
+        if (!printed)
+                pr_cont("%lu.%02lu BogoMIPS (lpj=%lu)\n",
                         loops_per_jiffy/(500000/HZ),
                         (loops_per_jiffy/(5000/HZ)) % 100, loops_per_jiffy);
+
+        printed = true;
 }