tracing: Drop the nested field from lock_release event

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 <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Hitoshi Mitake <[email protected]>
Cc: Steven Rostedt <[email protected]>

diff --git a/include/trace/events/lock.h b/include/trace/events/lock.h
index 17ca287ae176ceda2241b94b8b7890cd6727a870..fde4c38533916bfb94beeb0c5df0196363a9af63 100644 (file)
--- a/include/trace/events/lock.h
+++ b/include/trace/events/lock.h
@@ -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)

diff --git a/kernel/lockdep.c b/kernel/lockdep.c
index 31e22e742368b8c0e2d8e8051c4d08f47b6fb252..e9c759f06c1d114d5ab3d1bda286b5f30c6b194b 100644 (file)
--- a/kernel/lockdep.c
+++ b/kernel/lockdep.c
@@ -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);