From 8fadc24b371dd118e2d27bf6fb3387e193752a4e Mon Sep 17 00:00:00 2001 From: Frederic Weisbecker Date: Sat, 8 May 2010 06:24:25 +0200 Subject: [PATCH] --- yaml --- r: 191325 b: refs/heads/master c: 93135439459920c4d856f4ab8f068c030085c8df h: refs/heads/master i: 191323: a8f49fcb54c3ddc9b7fa2f6a2c12270228f09c29 v: v3 --- [refs] | 2 +- trunk/include/trace/events/lock.h | 4 ++-- trunk/kernel/lockdep.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 889601a3f565..ed211cc43500 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 883a2a3189dae9d2912c417e47152f51cb922a3f +refs/heads/master: 93135439459920c4d856f4ab8f068c030085c8df diff --git a/trunk/include/trace/events/lock.h b/trunk/include/trace/events/lock.h index 17ca287ae176..fde4c3853391 100644 --- a/trunk/include/trace/events/lock.h +++ b/trunk/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/trunk/kernel/lockdep.c b/trunk/kernel/lockdep.c index 31e22e742368..e9c759f06c1d 100644 --- a/trunk/kernel/lockdep.c +++ b/trunk/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);