diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2008-10-22 09:48:06 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2008-10-22 09:48:06 +0200 |
| commit | 268a3dcfea2077fca60d3715caa5c96f9b5e6ea7 (patch) | |
| tree | c2232774508424e677e27f296090a68c775e4669 /kernel/time/timer_list.c | |
| parent | c4bd822e7b12a9008241d76db45b665f2fef180c (diff) | |
| parent | 592aa999d6a272856c9bfbdaac0cfba1bb37c24c (diff) | |
| download | kernel_samsung_smdk4412-268a3dcfea2077fca60d3715caa5c96f9b5e6ea7.zip kernel_samsung_smdk4412-268a3dcfea2077fca60d3715caa5c96f9b5e6ea7.tar.gz kernel_samsung_smdk4412-268a3dcfea2077fca60d3715caa5c96f9b5e6ea7.tar.bz2 | |
Merge branch 'timers/range-hrtimers' into v28-range-hrtimers-for-linus-v2
Conflicts:
kernel/time/tick-sched.c
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/time/timer_list.c')
| -rw-r--r-- | kernel/time/timer_list.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c index f642691..a999b92 100644 --- a/kernel/time/timer_list.c +++ b/kernel/time/timer_list.c @@ -66,9 +66,11 @@ print_timer(struct seq_file *m, struct hrtimer *taddr, struct hrtimer *timer, SEQ_printf(m, ", %s/%d", tmp, timer->start_pid); #endif SEQ_printf(m, "\n"); - SEQ_printf(m, " # expires at %Lu nsecs [in %Ld nsecs]\n", - (unsigned long long)ktime_to_ns(timer->expires), - (long long)(ktime_to_ns(timer->expires) - now)); + SEQ_printf(m, " # expires at %Lu-%Lu nsecs [in %Ld to %Ld nsecs]\n", + (unsigned long long)ktime_to_ns(hrtimer_get_softexpires(timer)), + (unsigned long long)ktime_to_ns(hrtimer_get_expires(timer)), + (long long)(ktime_to_ns(hrtimer_get_softexpires(timer)) - now), + (long long)(ktime_to_ns(hrtimer_get_expires(timer)) - now)); } static void |