diff options
-rw-r--r-- | include/trace/events/lock.h (renamed from include/trace/events/lockdep.h) | 8 | ||||
-rw-r--r-- | kernel/lockdep.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/trace/events/lockdep.h b/include/trace/events/lock.h index bcf1d209a00d..a870ba125aa8 100644 --- a/include/trace/events/lockdep.h +++ b/include/trace/events/lock.h | |||
@@ -1,8 +1,8 @@ | |||
1 | #undef TRACE_SYSTEM | 1 | #undef TRACE_SYSTEM |
2 | #define TRACE_SYSTEM lockdep | 2 | #define TRACE_SYSTEM lock |
3 | 3 | ||
4 | #if !defined(_TRACE_LOCKDEP_H) || defined(TRACE_HEADER_MULTI_READ) | 4 | #if !defined(_TRACE_LOCK_H) || defined(TRACE_HEADER_MULTI_READ) |
5 | #define _TRACE_LOCKDEP_H | 5 | #define _TRACE_LOCK_H |
6 | 6 | ||
7 | #include <linux/lockdep.h> | 7 | #include <linux/lockdep.h> |
8 | #include <linux/tracepoint.h> | 8 | #include <linux/tracepoint.h> |
@@ -90,7 +90,7 @@ TRACE_EVENT(lock_acquired, | |||
90 | #endif | 90 | #endif |
91 | #endif | 91 | #endif |
92 | 92 | ||
93 | #endif /* _TRACE_LOCKDEP_H */ | 93 | #endif /* _TRACE_LOCK_H */ |
94 | 94 | ||
95 | /* This part must be outside protection */ | 95 | /* This part must be outside protection */ |
96 | #include <trace/define_trace.h> | 96 | #include <trace/define_trace.h> |
diff --git a/kernel/lockdep.c b/kernel/lockdep.c index 9af56723c096..f5dcd36d3151 100644 --- a/kernel/lockdep.c +++ b/kernel/lockdep.c | |||
@@ -49,7 +49,7 @@ | |||
49 | #include "lockdep_internals.h" | 49 | #include "lockdep_internals.h" |
50 | 50 | ||
51 | #define CREATE_TRACE_POINTS | 51 | #define CREATE_TRACE_POINTS |
52 | #include <trace/events/lockdep.h> | 52 | #include <trace/events/lock.h> |
53 | 53 | ||
54 | #ifdef CONFIG_PROVE_LOCKING | 54 | #ifdef CONFIG_PROVE_LOCKING |
55 | int prove_locking = 1; | 55 | int prove_locking = 1; |