1 files changed, 2 insertions, 5 deletions

diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index c47788fa85f9..8d32ae7768a7 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -732,7 +732,8 @@ look_up_lock_class(const struct lockdep_map *lock, unsigned int subclass)
                          * Huh! same key, different name? Did someone trample
                          * on some memory? We're most confused.
                          */
-                        WARN_ON_ONCE(class->name != lock->name);
+                        WARN_ON_ONCE(class->name != lock->name &&
+                                     lock->key != &__lockdep_no_validate__);
                         return class;
                 }
         }
@@ -2817,10 +2818,6 @@ static inline int validate_chain(struct task_struct *curr,
 {
         return 1;
 }
-
-static void print_lock_trace(struct lock_trace *trace, unsigned int spaces)
-{
-}
 #endif
 
 /*