diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-12-10 13:23:19 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-12-10 13:23:19 +0100 |
| commit | e9c0748b687aa70179a9e6d8ffc24b2874fe350b (patch) | |
| tree | a7f3093cbe19b0f890bb91c13d60093411a0a7d6 /include | |
| parent | 5f201907dfe4ad42c44006ddfcec00ed12e59497 (diff) | |
| download | op-kernel-dev-e9c0748b687aa70179a9e6d8ffc24b2874fe350b.zip op-kernel-dev-e9c0748b687aa70179a9e6d8ffc24b2874fe350b.tar.gz | |
itimer: Fix the itimer trace print format
Compiling powerpc64 results in:
include/trace/events/timer.h:279: warning:
format '%lu' expects type 'long unsigned int', but argument 4 has type 'cputime_t'
....
cputime_t on power is u64, which triggers the above warning.
Cast the cputime_t to unsigned long long and fix the print format
string. That works on both 32 and 64 bit architectures.
While at it change the print format for long variables from %lu to %ld.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Diffstat (limited to 'include')
| -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 */ |
