summaryrefslogtreecommitdiff
path: root/include/linux/lockdep.h
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2013-02-14 15:35:28 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2013-02-14 15:35:28 +1100
commitf600c997a1e930c3be312fdc4d1a67979d89173e (patch)
tree352f5d35d672887a5552730cb71af9d3f068fe19 /include/linux/lockdep.h
parent065957b017e290977dc5527ae4e21cff9d3fb5ec (diff)
parent0ef183f7f162a62662f6002b03bcf3ca2903c937 (diff)
Merge branch 'akpm/master'
Diffstat (limited to 'include/linux/lockdep.h')
-rw-r--r--include/linux/lockdep.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
index f05631effc73..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)