From 18f5e743288be7fc8cd24e4ab2f29492d793cbff Mon Sep 17 00:00:00 2001
From: Frederic Weisbecker <fweisbec@gmail.com>
Date: Sat, 8 May 2010 06:16:11 +0200
Subject: [PATCH] --- yaml --- r: 191324 b: refs/heads/master c:
 883a2a3189dae9d2912c417e47152f51cb922a3f h: refs/heads/master v: v3

---
 [refs]                            |  2 +-
 trunk/include/trace/events/lock.h | 11 ++++-------
 trunk/kernel/lockdep.c            |  2 +-
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index e6461f0e494d..889601a3f565 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 90c0e5fc7b73d2575c7367e1da70ff9521718e5e
+refs/heads/master: 883a2a3189dae9d2912c417e47152f51cb922a3f
diff --git a/trunk/include/trace/events/lock.h b/trunk/include/trace/events/lock.h
index 5c1dcfc16c60..17ca287ae176 100644
--- a/trunk/include/trace/events/lock.h
+++ b/trunk/include/trace/events/lock.h
@@ -78,24 +78,21 @@ TRACE_EVENT(lock_contended,
 );
 
 TRACE_EVENT(lock_acquired,
-	TP_PROTO(struct lockdep_map *lock, unsigned long ip, s64 waittime),
+	TP_PROTO(struct lockdep_map *lock, unsigned long ip),
 
-	TP_ARGS(lock, ip, waittime),
+	TP_ARGS(lock, ip),
 
 	TP_STRUCT__entry(
 		__string(name, lock->name)
-		__field(s64, wait_nsec)
 		__field(void *, lockdep_addr)
 	),
 
 	TP_fast_assign(
 		__assign_str(name, lock->name);
-		__entry->wait_nsec = waittime;
 		__entry->lockdep_addr = lock;
 	),
-	TP_printk("%p %s (%llu ns)", __entry->lockdep_addr,
-		  __get_str(name),
-		  __entry->wait_nsec)
+	TP_printk("%p %s", __entry->lockdep_addr,
+		  __get_str(name))
 );
 
 #endif
diff --git a/trunk/kernel/lockdep.c b/trunk/kernel/lockdep.c
index 2594e1ce41cb..31e22e742368 100644
--- a/trunk/kernel/lockdep.c
+++ b/trunk/kernel/lockdep.c
@@ -3380,7 +3380,7 @@ __lock_acquired(struct lockdep_map *lock, unsigned long ip)
 		hlock->holdtime_stamp = now;
 	}
 
-	trace_lock_acquired(lock, ip, waittime);
+	trace_lock_acquired(lock, ip);
 
 	stats = get_lock_stats(hlock_class(hlock));
 	if (waittime) {