diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/kernel_lock.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/lib/kernel_lock.c b/lib/kernel_lock.c index 5c10b2e1fd08..4ebfa5a164d7 100644 --- a/lib/kernel_lock.c +++ b/lib/kernel_lock.c | |||
@@ -8,9 +8,11 @@ | |||
8 | #include <linux/module.h> | 8 | #include <linux/module.h> |
9 | #include <linux/kallsyms.h> | 9 | #include <linux/kallsyms.h> |
10 | #include <linux/semaphore.h> | 10 | #include <linux/semaphore.h> |
11 | #define CREATE_TRACE_POINTS | ||
12 | #include <linux/smp_lock.h> | 11 | #include <linux/smp_lock.h> |
13 | 12 | ||
13 | #define CREATE_TRACE_POINTS | ||
14 | #include <trace/events/bkl.h> | ||
15 | |||
14 | /* | 16 | /* |
15 | * The 'big kernel lock' | 17 | * The 'big kernel lock' |
16 | * | 18 | * |
@@ -114,19 +116,24 @@ static inline void __unlock_kernel(void) | |||
114 | * This cannot happen asynchronously, so we only need to | 116 | * This cannot happen asynchronously, so we only need to |
115 | * worry about other CPU's. | 117 | * worry about other CPU's. |
116 | */ | 118 | */ |
117 | void __lockfunc _lock_kernel(void) | 119 | void __lockfunc _lock_kernel(const char *func, const char *file, int line) |
118 | { | 120 | { |
119 | int depth = current->lock_depth+1; | 121 | int depth = current->lock_depth + 1; |
122 | |||
123 | trace_lock_kernel(func, file, line); | ||
124 | |||
120 | if (likely(!depth)) | 125 | if (likely(!depth)) |
121 | __lock_kernel(); | 126 | __lock_kernel(); |
122 | current->lock_depth = depth; | 127 | current->lock_depth = depth; |
123 | } | 128 | } |
124 | 129 | ||
125 | void __lockfunc _unlock_kernel(void) | 130 | void __lockfunc _unlock_kernel(const char *func, const char *file, int line) |
126 | { | 131 | { |
127 | BUG_ON(current->lock_depth < 0); | 132 | BUG_ON(current->lock_depth < 0); |
128 | if (likely(--current->lock_depth < 0)) | 133 | if (likely(--current->lock_depth < 0)) |
129 | __unlock_kernel(); | 134 | __unlock_kernel(); |
135 | |||
136 | trace_unlock_kernel(func, file, line); | ||
130 | } | 137 | } |
131 | 138 | ||
132 | EXPORT_SYMBOL(_lock_kernel); | 139 | EXPORT_SYMBOL(_lock_kernel); |