Merge branch 'x86-entry-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / include / trace / events / timer.h

diff --git a/include/trace/events/timer.h b/include/trace/events/timer.h
index a57e4ee989d6229476471c5527a44b230014926c..b7a904825e7df8a3dff0262b466d257c258407d1 100644 (file)
--- a/include/trace/events/timer.h
+++ b/include/trace/events/timer.h
@@ -73,7 +73,7 @@ TRACE_EVENT(timer_start,
                __entry->flags          = flags;
        ),
 
-       TP_printk("timer=%p function=%pf expires=%lu [timeout=%ld] cpu=%u idx=%u flags=%s",
+       TP_printk("timer=%p function=%ps expires=%lu [timeout=%ld] cpu=%u idx=%u flags=%s",
                  __entry->timer, __entry->function, __entry->expires,
                  (long)__entry->expires - __entry->now,
                  __entry->flags & TIMER_CPUMASK,
@@ -89,23 +89,27 @@ TRACE_EVENT(timer_start,
  */
 TRACE_EVENT(timer_expire_entry,
 
-       TP_PROTO(struct timer_list *timer),
+       TP_PROTO(struct timer_list *timer, unsigned long baseclk),
 
-       TP_ARGS(timer),
+       TP_ARGS(timer, baseclk),
 
        TP_STRUCT__entry(
                __field( void *,        timer   )
                __field( unsigned long, now     )
                __field( void *,        function)
+               __field( unsigned long, baseclk )
        ),
 
        TP_fast_assign(
                __entry->timer          = timer;
                __entry->now            = jiffies;
                __entry->function       = timer->function;
+               __entry->baseclk        = baseclk;
        ),
 
-       TP_printk("timer=%p function=%pf now=%lu", __entry->timer, __entry->function,__entry->now)
+       TP_printk("timer=%p function=%ps now=%lu baseclk=%lu",
+                 __entry->timer, __entry->function, __entry->now,
+                 __entry->baseclk)
 );
 
 /**
@@ -210,7 +214,7 @@ TRACE_EVENT(hrtimer_start,
                __entry->mode           = mode;
        ),
 
-       TP_printk("hrtimer=%p function=%pf expires=%llu softexpires=%llu "
+       TP_printk("hrtimer=%p function=%ps expires=%llu softexpires=%llu "
                  "mode=%s", __entry->hrtimer, __entry->function,
                  (unsigned long long) __entry->expires,
                  (unsigned long long) __entry->softexpires,
@@ -243,7 +247,8 @@ TRACE_EVENT(hrtimer_expire_entry,
                __entry->function       = hrtimer->function;
        ),
 
-       TP_printk("hrtimer=%p function=%pf now=%llu", __entry->hrtimer, __entry->function,
+       TP_printk("hrtimer=%p function=%ps now=%llu",
+                 __entry->hrtimer, __entry->function,
                  (unsigned long long) __entry->now)
 );