Skip to content

Commit

Permalink
tracing: Drop the nested field from lock_release event
Browse files Browse the repository at this point in the history
Drop the nested field as we don't use it. Every nested state can
be computed from a state machine on post processing already.

Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Hitoshi Mitake <mitake@dcl.info.waseda.ac.jp>
Cc: Steven Rostedt <rostedt@goodmis.org>
  • Loading branch information
Frederic Weisbecker committed May 9, 2010
1 parent 883a2a3 commit 9313543
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions include/trace/events/lock.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ TRACE_EVENT(lock_acquire,

TRACE_EVENT(lock_release,

TP_PROTO(struct lockdep_map *lock, int nested, unsigned long ip),
TP_PROTO(struct lockdep_map *lock, unsigned long ip),

TP_ARGS(lock, nested, ip),
TP_ARGS(lock, ip),

TP_STRUCT__entry(
__string(name, lock->name)
Expand Down
2 changes: 1 addition & 1 deletion kernel/lockdep.c
Original file line number Diff line number Diff line change
Expand Up @@ -3227,7 +3227,7 @@ void lock_release(struct lockdep_map *lock, int nested,
raw_local_irq_save(flags);
check_flags(flags);
current->lockdep_recursion = 1;
trace_lock_release(lock, nested, ip);
trace_lock_release(lock, ip);
__lock_release(lock, nested, ip);
current->lockdep_recursion = 0;
raw_local_irq_restore(flags);
Expand Down

0 comments on commit 9313543

Please sign in to comment.