---

yaml --- r: 191325 b: refs/heads/master c: 9313543 h: refs/heads/master i: 191323: a8f49fc v: v3
git-mirror · May 9, 2010 · 8fadc24 · 8fadc24
1 parent 18f5e74
commit 8fadc24
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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);