diff options
-rw-r--r-- | include/trace/events/lock.h | 4 | ||||
-rw-r--r-- | kernel/lockdep.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/trace/events/lock.h b/include/trace/events/lock.h index 17ca287ae176..fde4c3853391 100644 --- a/include/trace/events/lock.h +++ b/include/trace/events/lock.h | |||
@@ -37,9 +37,9 @@ TRACE_EVENT(lock_acquire, | |||
37 | 37 | ||
38 | TRACE_EVENT(lock_release, | 38 | TRACE_EVENT(lock_release, |
39 | 39 | ||
40 | TP_PROTO(struct lockdep_map *lock, int nested, unsigned long ip), | 40 | TP_PROTO(struct lockdep_map *lock, unsigned long ip), |
41 | 41 | ||
42 | TP_ARGS(lock, nested, ip), | 42 | TP_ARGS(lock, ip), |
43 | 43 | ||
44 | TP_STRUCT__entry( | 44 | TP_STRUCT__entry( |
45 | __string(name, lock->name) | 45 | __string(name, lock->name) |
diff --git a/kernel/lockdep.c b/kernel/lockdep.c index 31e22e742368..e9c759f06c1d 100644 --- a/kernel/lockdep.c +++ b/kernel/lockdep.c | |||
@@ -3227,7 +3227,7 @@ void lock_release(struct lockdep_map *lock, int nested, | |||
3227 | raw_local_irq_save(flags); | 3227 | raw_local_irq_save(flags); |
3228 | check_flags(flags); | 3228 | check_flags(flags); |
3229 | current->lockdep_recursion = 1; | 3229 | current->lockdep_recursion = 1; |
3230 | trace_lock_release(lock, nested, ip); | 3230 | trace_lock_release(lock, ip); |
3231 | __lock_release(lock, nested, ip); | 3231 | __lock_release(lock, nested, ip); |
3232 | current->lockdep_recursion = 0; | 3232 | current->lockdep_recursion = 0; |
3233 | raw_local_irq_restore(flags); | 3233 | raw_local_irq_restore(flags); |