diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2009-08-21 11:27:29 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2009-08-21 11:27:29 -0400 |
| commit | e9dc122166b8d863d3057a66ada04838e5548e52 (patch) | |
| tree | 749e15bf719b64bf9113db7acd8e043d9742cb26 /include/trace/events/lockdep.h | |
| parent | 560ab42ef923aaf2e4347315bdfcc74b2708972c (diff) | |
| parent | 405d8f8b1d936414da2093d4149ff790ff3f84a5 (diff) | |
Merge branch 'nfs-for-2.6.32' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 into for-2.6.32-incoming
Conflicts:
net/sunrpc/cache.c
Diffstat (limited to 'include/trace/events/lockdep.h')
| -rw-r--r-- | include/trace/events/lockdep.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/trace/events/lockdep.h b/include/trace/events/lockdep.h index 0e956c9dfd7e..bcf1d209a00d 100644 --- a/include/trace/events/lockdep.h +++ b/include/trace/events/lockdep.h | |||
| @@ -1,12 +1,12 @@ | |||
| 1 | #undef TRACE_SYSTEM | ||
| 2 | #define TRACE_SYSTEM lockdep | ||
| 3 | |||
| 1 | #if !defined(_TRACE_LOCKDEP_H) || defined(TRACE_HEADER_MULTI_READ) | 4 | #if !defined(_TRACE_LOCKDEP_H) || defined(TRACE_HEADER_MULTI_READ) |
| 2 | #define _TRACE_LOCKDEP_H | 5 | #define _TRACE_LOCKDEP_H |
| 3 | 6 | ||
| 4 | #include <linux/lockdep.h> | 7 | #include <linux/lockdep.h> |
| 5 | #include <linux/tracepoint.h> | 8 | #include <linux/tracepoint.h> |
| 6 | 9 | ||
| 7 | #undef TRACE_SYSTEM | ||
| 8 | #define TRACE_SYSTEM lockdep | ||
| 9 | |||
| 10 | #ifdef CONFIG_LOCKDEP | 10 | #ifdef CONFIG_LOCKDEP |
| 11 | 11 | ||
| 12 | TRACE_EVENT(lock_acquire, | 12 | TRACE_EVENT(lock_acquire, |