diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-24 12:21:49 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-24 12:21:49 -0700 |
commit | 502adf5778f4151dcba3f64dd6ed322151f3712c (patch) | |
tree | ad14adb37dedaefabdaf93b08ab9d32bc140ed81 /include | |
parent | 3b6c5507a69861e80c26f21d04601c674cbeec3d (diff) | |
parent | c6db67cda735d8ace5f19c3831240e1408679790 (diff) | |
download | op-kernel-dev-502adf5778f4151dcba3f64dd6ed322151f3712c.zip op-kernel-dev-502adf5778f4151dcba3f64dd6ed322151f3712c.tar.gz |
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')
-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 c624126..425bcfe 100644 --- a/include/trace/events/timer.h +++ b/include/trace/events/timer.h @@ -81,14 +81,16 @@ TRACE_EVENT(timer_expire_entry, TP_STRUCT__entry( __field( void *, timer ) __field( unsigned long, now ) + __field( void *, function) ), TP_fast_assign( __entry->timer = timer; __entry->now = jiffies; + __entry->function = timer->function; ), - TP_printk("timer=%p now=%lu", __entry->timer, __entry->now) + TP_printk("timer=%p function=%pf now=%lu", __entry->timer, __entry->function,__entry->now) ); /** @@ -200,14 +202,16 @@ TRACE_EVENT(hrtimer_expire_entry, TP_STRUCT__entry( __field( void *, hrtimer ) __field( s64, now ) + __field( void *, function) ), TP_fast_assign( __entry->hrtimer = hrtimer; __entry->now = now->tv64; + __entry->function = hrtimer->function; ), - TP_printk("hrtimer=%p now=%llu", __entry->hrtimer, + TP_printk("hrtimer=%p function=%pf now=%llu", __entry->hrtimer, __entry->function, (unsigned long long)ktime_to_ns((ktime_t) { .tv64 = __entry->now })) ); |