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

[karo-tx-linux.git] / include / trace / lockdep_event_types.h

diff --git a/include/trace/lockdep_event_types.h b/include/trace/lockdep_event_types.h
index f713d74a82b4d3c237968a072a6a09d3ae406ef7..adccfcd2ec8fcb737abc24ce6686b75216c508f8 100644 (file)
--- a/include/trace/lockdep_event_types.h
+++ b/include/trace/lockdep_event_types.h
@@ -1,5 +1,5 @@
 
-#ifndef TRACE_EVENT_FORMAT
+#ifndef TRACE_FORMAT
 # error Do not include this file directly.
 # error Unless you know what you are doing.
 #endif
@@ -10,32 +10,32 @@
 #ifdef CONFIG_LOCKDEP
 
 TRACE_FORMAT(lock_acquire,
-       TPPROTO(struct lockdep_map *lock, unsigned int subclass,
+       TP_PROTO(struct lockdep_map *lock, unsigned int subclass,
                int trylock, int read, int check,
                struct lockdep_map *next_lock, unsigned long ip),
-       TPARGS(lock, subclass, trylock, read, check, next_lock, ip),
-       TPFMT("%s%s%s", trylock ? "try " : "",
+       TP_ARGS(lock, subclass, trylock, read, check, next_lock, ip),
+       TP_FMT("%s%s%s", trylock ? "try " : "",
                read ? "read " : "", lock->name)
        );
 
 TRACE_FORMAT(lock_release,
-       TPPROTO(struct lockdep_map *lock, int nested, unsigned long ip),
-       TPARGS(lock, nested, ip),
-       TPFMT("%s", lock->name)
+       TP_PROTO(struct lockdep_map *lock, int nested, unsigned long ip),
+       TP_ARGS(lock, nested, ip),
+       TP_FMT("%s", lock->name)
        );
 
 #ifdef CONFIG_LOCK_STAT
 
 TRACE_FORMAT(lock_contended,
-       TPPROTO(struct lockdep_map *lock, unsigned long ip),
-       TPARGS(lock, ip),
-       TPFMT("%s", lock->name)
+       TP_PROTO(struct lockdep_map *lock, unsigned long ip),
+       TP_ARGS(lock, ip),
+       TP_FMT("%s", lock->name)
        );
 
 TRACE_FORMAT(lock_acquired,
-       TPPROTO(struct lockdep_map *lock, unsigned long ip),
-       TPARGS(lock, ip),
-       TPFMT("%s", lock->name)
+       TP_PROTO(struct lockdep_map *lock, unsigned long ip),
+       TP_ARGS(lock, ip),
+       TP_FMT("%s", lock->name)
        );
 
 #endif