aboutsummaryrefslogtreecommitdiffstats
path: root/include/trace
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-24 12:21:49 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-24 12:21:49 -0700
commit502adf5778f4151dcba3f64dd6ed322151f3712c (patch)
treead14adb37dedaefabdaf93b08ab9d32bc140ed81 /include/trace
parent3b6c5507a69861e80c26f21d04601c674cbeec3d (diff)
parentc6db67cda735d8ace5f19c3831240e1408679790 (diff)
downloadmrst-s0i3-test-502adf5778f4151dcba3f64dd6ed322151f3712c.tar.gz
mrst-s0i3-test-502adf5778f4151dcba3f64dd6ed322151f3712c.tar.xz
mrst-s0i3-test-502adf5778f4151dcba3f64dd6ed322151f3712c.zip
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.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/include/trace/events/timer.h b/include/trace/events/timer.h
index c624126a9c8..425bcfe56c6 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 }))
);