1 files changed, 4 insertions, 2 deletions

diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
index 2bca44b0893c..f1e877b79ed8 100644
--- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h
@@ -359,7 +359,9 @@ extern void lockdep_trace_alloc(gfp_t mask);
 
 #define lockdep_depth(tsk)      (debug_locks ? (tsk)->lockdep_depth : 0)
 
-#define lockdep_assert_held(l)  WARN_ON(debug_locks && !lockdep_is_held(l))
+#define lockdep_assert_held(l)  do {                            \
+                WARN_ON(debug_locks && !lockdep_is_held(l));    \
+        } while (0)
 
 #define lockdep_recursing(tsk)  ((tsk)->lockdep_recursion)
 
@@ -410,7 +412,7 @@ struct lock_class_key { };
 
 #define lockdep_depth(tsk)      (0)
 
-#define lockdep_assert_held(l)                  do { } while (0)
+#define lockdep_assert_held(l)                  do { (void)(l); } while (0)
 
 #define lockdep_recursing(tsk)                  (0)