diff options
author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2014-08-26 16:02:38 -0400 |
---|---|---|
committer | Steven Rostedt <rostedt@goodmis.org> | 2014-08-26 16:02:38 -0400 |
commit | fe3af705eed7127535d4aafaf0d34cbd43f53a90 (patch) | |
tree | 406fb276ec5801b3c5f5b7f777043215b9dc9a81 /kernel/trace/trace_clock.c | |
parent | 4f1589607c38ffbb065a960d8915d9ebe1dae9a2 (diff) | |
parent | d83a3234d2e1e2a55e7f2430fc9ca29a9bd315e7 (diff) |
Merge tag 'v3.12.26' into v3.12-rt
This is the 3.12.26 stable release
Conflicts:
kernel/Kconfig.locks
kernel/trace/trace.c
Diffstat (limited to 'kernel/trace/trace_clock.c')
-rw-r--r-- | kernel/trace/trace_clock.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/kernel/trace/trace_clock.c b/kernel/trace/trace_clock.c index 26dc348332b7..57b67b1f24d1 100644 --- a/kernel/trace/trace_clock.c +++ b/kernel/trace/trace_clock.c @@ -59,13 +59,14 @@ u64 notrace trace_clock(void) /* * trace_jiffy_clock(): Simply use jiffies as a clock counter. + * Note that this use of jiffies_64 is not completely safe on + * 32-bit systems. But the window is tiny, and the effect if + * we are affected is that we will have an obviously bogus + * timestamp on a trace event - i.e. not life threatening. */ u64 notrace trace_clock_jiffies(void) { - u64 jiffy = jiffies - INITIAL_JIFFIES; - - /* Return nsecs */ - return (u64)jiffies_to_usecs(jiffy) * 1000ULL; + return jiffies_64_to_clock_t(jiffies_64 - INITIAL_JIFFIES); } /* |