aboutsummaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-04-13 11:30:26 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-13 11:30:26 -0700
commitbf20753c0cdf842c5c65af688c2cefd1eafa7630 (patch)
tree8431fb73349b928d93ce02e24c1c993562fa1f95 /include/linux
parent01599fca6758d2cd133e78f87426fc851c9ea725 (diff)
parent574bbe782057fdf0490dc7dec906a2dc26363e20 (diff)
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: lockdep: continue lock debugging despite some taints lockdep: warn about lockdep disabling after kernel taint
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/debug_locks.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/debug_locks.h b/include/linux/debug_locks.h
index 096476f1fb3..493dedb7a67 100644
--- a/include/linux/debug_locks.h
+++ b/include/linux/debug_locks.h
@@ -2,12 +2,19 @@
#define __LINUX_DEBUG_LOCKING_H
#include <linux/kernel.h>
+#include <asm/atomic.h>
struct task_struct;
extern int debug_locks;
extern int debug_locks_silent;
+
+static inline int __debug_locks_off(void)
+{
+ return xchg(&debug_locks, 0);
+}
+
/*
* Generic 'turn off all lock debugging' function:
*/