From: Andrew Morton <akpm@linux-foundation.org>

kernel/mutex.c: In function '__mutex_lock_common':
kernel/mutex.c:146: error: 'struct mutex' has no member named 'dep_map'
kernel/mutex.c:183: error: 'struct mutex' has no member named 'dep_map'

tra la la.

Cc: Ingo Molnar <mingo@elte.hu>
Cc: Jason Baron <jbaron@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 Kconfig.debug           |    0 
 include/linux/lockdep.h |    9 ++-------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff -puN include/linux/lockdep.h~lockstat-core-infrastructure-fix-fix include/linux/lockdep.h
--- a/include/linux/lockdep.h~lockstat-core-infrastructure-fix-fix
+++ a/include/linux/lockdep.h
@@ -326,13 +326,8 @@ do {								\
 
 #else /* CONFIG_LOCK_STAT */
 
-static inline void lock_contended(struct lockdep_map *lock, unsigned long ip)
-{
-}
-
-static inline void lock_acquired(struct lockdep_map *lock)
-{
-}
+#define lock_contended(lockdep_map, ip) do {} while (0)
+#define lock_acquired(lockdep_map) do {} while (0)
 
 #define LOCK_CONTENDED(_lock, try, lock) \
 	lock(_lock)
diff -puN kernel/lockdep.c~lockstat-core-infrastructure-fix-fix kernel/lockdep.c
diff -puN kernel/sysctl.c~lockstat-core-infrastructure-fix-fix kernel/sysctl.c
diff -puN lib/Kconfig.debug~lockstat-core-infrastructure-fix-fix lib/Kconfig.debug
_