Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 86b7cbc9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 230b548c db4315d6

kernel/time/timer_list.c

+2 −2
Original line number Diff line number Diff line
@@ -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