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

[mv-sheeva.git] / kernel / hrtimer.c

diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index 3e1c36e7998fdbeffa17142bade5c358c61a2857..ede52770812389282650012fc4cc0a763a435e13 100644 (file)
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -1238,7 +1238,8 @@ hrtimer_interrupt_hanging(struct clock_event_device *dev,
        force_clock_reprogram = 1;
        dev->min_delta_ns = (unsigned long)try_time.tv64 * 3;
        printk(KERN_WARNING "hrtimer: interrupt too slow, "
-               "forcing clock min delta to %lu ns\n", dev->min_delta_ns);
+              "forcing clock min delta to %llu ns\n",
+              (unsigned long long) dev->min_delta_ns);
 }
 /*
  * High resolution timer interrupt