Patched in Tegra support.

1 files changed, 1 insertions, 26 deletions

diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
index 2bca44b0893..ef820a3c378 100644
--- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h
@@ -157,24 +157,6 @@ struct lockdep_map {
 #endif
 };
 
-static inline void lockdep_copy_map(struct lockdep_map *to,
-                                    struct lockdep_map *from)
-{
-        int i;
-
-        *to = *from;
-        /*
-         * Since the class cache can be modified concurrently we could observe
-         * half pointers (64bit arch using 32bit copy insns). Therefore clear
-         * the caches and take the performance hit.
-         *
-         * XXX it doesn't work well with lockdep_set_class_and_subclass(), since
-         *     that relies on cache abuse.
-         */
-        for (i = 0; i < NR_LOCKDEP_CACHING_CLASSES; i++)
-                to->class_cache[i] = NULL;
-}
-
 /*
  * Every lock has a list of other locks that were taken after it.
  * We only grow the list, never remove from it:
@@ -361,8 +343,6 @@ extern void lockdep_trace_alloc(gfp_t mask);
 
 #define lockdep_assert_held(l)  WARN_ON(debug_locks && !lockdep_is_held(l))
 
-#define lockdep_recursing(tsk)  ((tsk)->lockdep_recursion)
-
 #else /* !LOCKDEP */
 
 static inline void lockdep_off(void)
@@ -412,8 +392,6 @@ struct lock_class_key { };
 
 #define lockdep_assert_held(l)                  do { } while (0)
 
-#define lockdep_recursing(tsk)                  (0)
-
 #endif /* !LOCKDEP */
 
 #ifdef CONFIG_LOCK_STAT
@@ -524,17 +502,14 @@ static inline void print_irqtrace_events(struct task_struct *curr)
 #ifdef CONFIG_DEBUG_LOCK_ALLOC
 # ifdef CONFIG_PROVE_LOCKING
 #  define rwsem_acquire(l, s, t, i)             lock_acquire(l, s, t, 0, 2, NULL, i)
-#  define rwsem_acquire_nest(l, s, t, n, i)     lock_acquire(l, s, t, 0, 2, n, i)
 #  define rwsem_acquire_read(l, s, t, i)        lock_acquire(l, s, t, 1, 2, NULL, i)
 # else
 #  define rwsem_acquire(l, s, t, i)             lock_acquire(l, s, t, 0, 1, NULL, i)
-#  define rwsem_acquire_nest(l, s, t, n, i)     lock_acquire(l, s, t, 0, 1, n, i)
 #  define rwsem_acquire_read(l, s, t, i)        lock_acquire(l, s, t, 1, 1, NULL, i)
 # endif
 # define rwsem_release(l, n, i)                 lock_release(l, n, i)
 #else
 # define rwsem_acquire(l, s, t, i)              do { } while (0)
-# define rwsem_acquire_nest(l, s, t, n, i)      do { } while (0)
 # define rwsem_acquire_read(l, s, t, i)         do { } while (0)
 # define rwsem_release(l, n, i)                 do { } while (0)
 #endif
@@ -573,7 +548,7 @@ do {									\
 #endif
 
 #ifdef CONFIG_PROVE_RCU
-void lockdep_rcu_suspicious(const char *file, const int line, const char *s);
+extern void lockdep_rcu_dereference(const char *file, const int line);
 #endif
 
 #endif /* __LINUX_LOCKDEP_H */