Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus

1 files changed, 2 insertions, 2 deletions

diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c
index d3d94c1a0fd2..67fe8fc21fb1 100644
--- a/kernel/time/timer_list.c
+++ b/kernel/time/timer_list.c
@@ -65,9 +65,9 @@ print_timer(struct seq_file *m, struct hrtimer *timer, int idx, u64 now)
         SEQ_printf(m, ", %s/%d", tmp, timer->start_pid);
 #endif
         SEQ_printf(m, "\n");
-        SEQ_printf(m, " # expires at %Lu nsecs [in %Lu nsecs]\n",
+        SEQ_printf(m, " # expires at %Lu nsecs [in %Ld nsecs]\n",
                 (unsigned long long)ktime_to_ns(timer->expires),
-                (unsigned long long)(ktime_to_ns(timer->expires) - now));
+                (long long)(ktime_to_ns(timer->expires) - now));
 }
 
 static void