summaryrefslogtreecommitdiff
path: root/include/linux/lockdep.h
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2013-02-07 17:04:23 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2013-02-07 17:04:23 +1100
commit89fa7d4989785694ba720133c0fd3d7485cd059a (patch)
treeef062d89ed62defaed0856e9e0dff6e130b54aff /include/linux/lockdep.h
parente61c0ad53a8281dca1f392a7654e9b1f2210cb91 (diff)
parentf66cce24892aa254a556516339c8307a1a6fd165 (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)