diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-18 15:45:48 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-18 15:45:48 -0800 |
| commit | 86b7cbc9d3f7b357dbd4f22779c5df375eb76c46 (patch) | |
| tree | 13d2d064452cdbb58053bbdb14fe6741c766e85f | |
| parent | 230b548c15d50068f993948ef4d803f5cc033454 (diff) | |
| parent | db4315d6f53edc2cc0b0b06fce1beffebb119c71 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt
* git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt:
timer_list: print relative expiry time signed
| -rw-r--r-- | kernel/time/timer_list.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c index d3d94c1a0fd..67fe8fc21fb 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 |