---

yaml --- r: 117614 b: refs/heads/master c: 704af52 h: refs/heads/master v: v3
git-mirror · Sep 7, 2008 · 48752b0 · 48752b0
1 parent 94ef993
commit 48752b0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4ce105d30e08fb8a1783c55a0e48aa3fa200c455
+refs/heads/master: 704af52bd13a5d9f3c60c496c68e752fafdfb434
diff --git a/trunk/kernel/time/timer_list.c b/trunk/kernel/time/timer_list.c
@@ -65,8 +65,10 @@ 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 %Ld nsecs]\n",
+	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));
 }