summaryrefslogtreecommitdiff
path: root/include/linux/debug_locks.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-04-21 10:46:39 +0200
committerIngo Molnar <mingo@elte.hu>2009-04-21 10:46:54 +0200
commit8ecee4620e76aae418bfa0e8cc830e92cb559bbb (patch)
tree49a36784c0a26c8494a37087e37502101013b35d /include/linux/debug_locks.h
parent6424fb38667fffbbb1b90be0ffd9a0c540db6a4b (diff)
parenta939b96cccdb65df80a52447ec8e4a6d79c56dbb (diff)
Merge branch 'linus' into x86/mm
Merge reason: refresh the topic: there's been 290 non-merges commits upstream to arch/x86 alone. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/debug_locks.h')
-rw-r--r--include/linux/debug_locks.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/debug_locks.h b/include/linux/debug_locks.h
index 096476f1fb35..29b3ce3f2a1d 100644
--- a/include/linux/debug_locks.h
+++ b/include/linux/debug_locks.h
@@ -2,12 +2,20 @@
#define __LINUX_DEBUG_LOCKING_H
#include <linux/kernel.h>
+#include <asm/atomic.h>
+#include <asm/system.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:
*/