diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-11 20:49:09 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-11 20:49:09 -0800 |
| commit | 3070f27d6ecb69364e7cffe16c8b15e1b8ef41dd (patch) | |
| tree | 6a624eb764265b67b2765b978c749fbe08871886 /include/trace/events | |
| parent | 1e57c2186fc204ecd5e47f279d00eba3c3db245c (diff) | |
| parent | e9c0748b687aa70179a9e6d8ffc24b2874fe350b (diff) | |
| download | kernel_samsung_aries-3070f27d6ecb69364e7cffe16c8b15e1b8ef41dd.zip kernel_samsung_aries-3070f27d6ecb69364e7cffe16c8b15e1b8ef41dd.tar.gz kernel_samsung_aries-3070f27d6ecb69364e7cffe16c8b15e1b8ef41dd.tar.bz2 | |
Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
itimer: Fix the itimer trace print format
hrtimer: move timer stats helper functions to hrtimer.c
hrtimer: Tune hrtimer_interrupt hang logic
Diffstat (limited to 'include/trace/events')
| -rw-r--r-- | include/trace/events/timer.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/trace/events/timer.h b/include/trace/events/timer.h index e5ce87a..9496b96 100644 --- a/include/trace/events/timer.h +++ b/include/trace/events/timer.h @@ -301,8 +301,8 @@ TRACE_EVENT(itimer_state, __entry->interval_usec = value->it_interval.tv_usec; ), - TP_printk("which=%d expires=%lu it_value=%lu.%lu it_interval=%lu.%lu", - __entry->which, __entry->expires, + TP_printk("which=%d expires=%llu it_value=%ld.%ld it_interval=%ld.%ld", + __entry->which, (unsigned long long)__entry->expires, __entry->value_sec, __entry->value_usec, __entry->interval_sec, __entry->interval_usec) ); @@ -331,8 +331,8 @@ TRACE_EVENT(itimer_expire, __entry->pid = pid_nr(pid); ), - TP_printk("which=%d pid=%d now=%lu", __entry->which, - (int) __entry->pid, __entry->now) + TP_printk("which=%d pid=%d now=%llu", __entry->which, + (int) __entry->pid, (unsigned long long)__entry->now) ); #endif /* _TRACE_TIMER_H */ |