From b86d1c3bb7c5e00891e83d50e3fbac8c254687fa Mon Sep 17 00:00:00 2001 From: Frederic Weisbecker Date: Sun, 19 Apr 2009 04:54:49 +0200 Subject: [PATCH] --- yaml --- r: 146052 b: refs/heads/master c: 7e7ca9a22dbbc5c91763cd16923c7509918709b6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/trace/events/lockdep.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 904a5c5efb38..604163e42e4f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9cbf117662e24c6d33245666804487f92c21b59d +refs/heads/master: 7e7ca9a22dbbc5c91763cd16923c7509918709b6 diff --git a/trunk/include/trace/events/lockdep.h b/trunk/include/trace/events/lockdep.h index 45e326b5c7f3..3ca315c1429d 100644 --- a/trunk/include/trace/events/lockdep.h +++ b/trunk/include/trace/events/lockdep.h @@ -38,16 +38,16 @@ TRACE_EVENT(lock_acquired, TP_ARGS(lock, ip, waittime), TP_STRUCT__entry( - __field(const char *, name) + __string(name, lock->name) __field(unsigned long, wait_usec) __field(unsigned long, wait_nsec_rem) ), TP_fast_assign( - __entry->name = lock->name; + __assign_str(name, lock->name); __entry->wait_nsec_rem = do_div(waittime, NSEC_PER_USEC); __entry->wait_usec = (unsigned long) waittime; ), - TP_printk("%s (%lu.%03lu us)", __entry->name, __entry->wait_usec, + TP_printk("%s (%lu.%03lu us)", __get_str(name), __entry->wait_usec, __entry->wait_nsec_rem) );