aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/trace/events/lock.h11
-rw-r--r--kernel/lockdep.c2
2 files changed, 5 insertions, 8 deletions
diff --git a/include/trace/events/lock.h b/include/trace/events/lock.h
index 5c1dcfc16c60..17ca287ae176 100644
--- a/include/trace/events/lock.h
+++ b/include/trace/events/lock.h
@@ -78,24 +78,21 @@ TRACE_EVENT(lock_contended,
78); 78);
79 79
80TRACE_EVENT(lock_acquired, 80TRACE_EVENT(lock_acquired,
81 TP_PROTO(struct lockdep_map *lock, unsigned long ip, s64 waittime), 81 TP_PROTO(struct lockdep_map *lock, unsigned long ip),
82 82
83 TP_ARGS(lock, ip, waittime), 83 TP_ARGS(lock, ip),
84 84
85 TP_STRUCT__entry( 85 TP_STRUCT__entry(
86 __string(name, lock->name) 86 __string(name, lock->name)
87 __field(s64, wait_nsec)
88 __field(void *, lockdep_addr) 87 __field(void *, lockdep_addr)
89 ), 88 ),
90 89
91 TP_fast_assign( 90 TP_fast_assign(
92 __assign_str(name, lock->name); 91 __assign_str(name, lock->name);
93 __entry->wait_nsec = waittime;
94 __entry->lockdep_addr = lock; 92 __entry->lockdep_addr = lock;
95 ), 93 ),
96 TP_printk("%p %s (%llu ns)", __entry->lockdep_addr, 94 TP_printk("%p %s", __entry->lockdep_addr,
97 __get_str(name), 95 __get_str(name))
98 __entry->wait_nsec)
99); 96);
100 97
101#endif 98#endif
diff --git a/kernel/lockdep.c b/kernel/lockdep.c
index 2594e1ce41cb..31e22e742368 100644
--- a/kernel/lockdep.c
+++ b/kernel/lockdep.c
@@ -3380,7 +3380,7 @@ found_it:
3380 hlock->holdtime_stamp = now; 3380 hlock->holdtime_stamp = now;
3381 } 3381 }
3382 3382
3383 trace_lock_acquired(lock, ip, waittime); 3383 trace_lock_acquired(lock, ip);
3384 3384
3385 stats = get_lock_stats(hlock_class(hlock)); 3385 stats = get_lock_stats(hlock_class(hlock));
3386 if (waittime) { 3386 if (waittime) {