diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-24 15:21:49 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-24 15:21:49 -0400 |
commit | 502adf5778f4151dcba3f64dd6ed322151f3712c (patch) | |
tree | ad14adb37dedaefabdaf93b08ab9d32bc140ed81 /include/trace | |
parent | 3b6c5507a69861e80c26f21d04601c674cbeec3d (diff) | |
parent | c6db67cda735d8ace5f19c3831240e1408679790 (diff) |
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
watchdog: Don't throttle the watchdog
tracing: Fix timer tracing
Diffstat (limited to 'include/trace')
-rw-r--r-- | include/trace/events/timer.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/trace/events/timer.h b/include/trace/events/timer.h index c624126a9c8a..425bcfe56c62 100644 --- a/include/trace/events/timer.h +++ b/include/trace/events/timer.h | |||
@@ -81,14 +81,16 @@ TRACE_EVENT(timer_expire_entry, | |||
81 | TP_STRUCT__entry( | 81 | TP_STRUCT__entry( |
82 | __field( void *, timer ) | 82 | __field( void *, timer ) |
83 | __field( unsigned long, now ) | 83 | __field( unsigned long, now ) |
84 | __field( void *, function) | ||
84 | ), | 85 | ), |
85 | 86 | ||
86 | TP_fast_assign( | 87 | TP_fast_assign( |
87 | __entry->timer = timer; | 88 | __entry->timer = timer; |
88 | __entry->now = jiffies; | 89 | __entry->now = jiffies; |
90 | __entry->function = timer->function; | ||
89 | ), | 91 | ), |
90 | 92 | ||
91 | TP_printk("timer=%p now=%lu", __entry->timer, __entry->now) | 93 | TP_printk("timer=%p function=%pf now=%lu", __entry->timer, __entry->function,__entry->now) |
92 | ); | 94 | ); |
93 | 95 | ||
94 | /** | 96 | /** |
@@ -200,14 +202,16 @@ TRACE_EVENT(hrtimer_expire_entry, | |||
200 | TP_STRUCT__entry( | 202 | TP_STRUCT__entry( |
201 | __field( void *, hrtimer ) | 203 | __field( void *, hrtimer ) |
202 | __field( s64, now ) | 204 | __field( s64, now ) |
205 | __field( void *, function) | ||
203 | ), | 206 | ), |
204 | 207 | ||
205 | TP_fast_assign( | 208 | TP_fast_assign( |
206 | __entry->hrtimer = hrtimer; | 209 | __entry->hrtimer = hrtimer; |
207 | __entry->now = now->tv64; | 210 | __entry->now = now->tv64; |
211 | __entry->function = hrtimer->function; | ||
208 | ), | 212 | ), |
209 | 213 | ||
210 | TP_printk("hrtimer=%p now=%llu", __entry->hrtimer, | 214 | TP_printk("hrtimer=%p function=%pf now=%llu", __entry->hrtimer, __entry->function, |
211 | (unsigned long long)ktime_to_ns((ktime_t) { .tv64 = __entry->now })) | 215 | (unsigned long long)ktime_to_ns((ktime_t) { .tv64 = __entry->now })) |
212 | ); | 216 | ); |
213 | 217 | ||