[GFS2] Remove unused GL_DUMP flag

[linux-2.6-omap-h63xx.git] / include / linux / spinlock.h

diff --git a/include/linux/spinlock.h b/include/linux/spinlock.h
index 54ad37089c499c96bba78add0a63972fbff495b9..8451052ca66f4ad14da7bc1bc120578d455fb626 100644 (file)
--- a/include/linux/spinlock.h
+++ b/include/linux/spinlock.h
@@ -52,7 +52,6 @@
 #include <linux/thread_info.h>
 #include <linux/kernel.h>
 #include <linux/stringify.h>
-#include <linux/irqflags.h>
 
 #include <asm/system.h>
 
@@ -184,37 +183,27 @@ do {                                                              \
 #define read_lock(lock)                        _read_lock(lock)
 
 #if defined(CONFIG_SMP) || defined(CONFIG_DEBUG_SPINLOCK)
-#define spin_lock_irqsave(lock, flags)                 \
-       do {                                            \
-               BUILD_CHECK_IRQ_FLAGS(flags);           \
-               flags = _spin_lock_irqsave(lock);       \
-       } while (0)
-#define read_lock_irqsave(lock, flags)                 \
-       do {                                            \
-               BUILD_CHECK_IRQ_FLAGS(flags);           \
-               flags = _read_lock_irqsave(lock);       \
-       } while (0)
-#define write_lock_irqsave(lock, flags)                        \
-       do {                                            \
-               BUILD_CHECK_IRQ_FLAGS(flags);           \
-               flags = _write_lock_irqsave(lock);      \
-       } while (0)
+
+#define spin_lock_irqsave(lock, flags) flags = _spin_lock_irqsave(lock)
+#define read_lock_irqsave(lock, flags) flags = _read_lock_irqsave(lock)
+#define write_lock_irqsave(lock, flags)        flags = _write_lock_irqsave(lock)
+
+#ifdef CONFIG_DEBUG_LOCK_ALLOC
+#define spin_lock_irqsave_nested(lock, flags, subclass) \
+       flags = _spin_lock_irqsave_nested(lock, subclass)
+#else
+#define spin_lock_irqsave_nested(lock, flags, subclass) \
+       flags = _spin_lock_irqsave(lock)
+#endif
+
 #else
-#define spin_lock_irqsave(lock, flags)                 \
-       do {                                            \
-               BUILD_CHECK_IRQ_FLAGS(flags);           \
-               _spin_lock_irqsave(lock, flags);        \
-       } while (0)
-#define read_lock_irqsave(lock, flags)                 \
-       do {                                            \
-               BUILD_CHECK_IRQ_FLAGS(flags);           \
-               _read_lock_irqsave(lock, flags);        \
-       } while (0)
-#define write_lock_irqsave(lock, flags)                        \
-       do {                                            \
-               BUILD_CHECK_IRQ_FLAGS(flags);           \
-               _write_lock_irqsave(lock, flags);       \
-       } while (0)
+
+#define spin_lock_irqsave(lock, flags) _spin_lock_irqsave(lock, flags)
+#define read_lock_irqsave(lock, flags) _read_lock_irqsave(lock, flags)
+#define write_lock_irqsave(lock, flags)        _write_lock_irqsave(lock, flags)
+#define spin_lock_irqsave_nested(lock, flags, subclass)        \
+       spin_lock_irqsave(lock, flags)
+
 #endif
 
 #define spin_lock_irq(lock)            _spin_lock_irq(lock)
@@ -250,24 +239,15 @@ do {                                                              \
 #endif
 
 #define spin_unlock_irqrestore(lock, flags) \
-       do {                                            \
-               BUILD_CHECK_IRQ_FLAGS(flags);           \
-               _spin_unlock_irqrestore(lock, flags);   \
-       } while (0)
+                                       _spin_unlock_irqrestore(lock, flags)
 #define spin_unlock_bh(lock)           _spin_unlock_bh(lock)
 
 #define read_unlock_irqrestore(lock, flags) \
-       do {                                            \
-               BUILD_CHECK_IRQ_FLAGS(flags);           \
-               _read_unlock_irqrestore(lock, flags);   \
-       } while (0)
+                                       _read_unlock_irqrestore(lock, flags)
 #define read_unlock_bh(lock)           _read_unlock_bh(lock)
 
 #define write_unlock_irqrestore(lock, flags) \
-       do {                                            \
-               BUILD_CHECK_IRQ_FLAGS(flags);           \
-               _write_unlock_irqrestore(lock, flags);  \
-       } while (0)
+                                       _write_unlock_irqrestore(lock, flags)
 #define write_unlock_bh(lock)          _write_unlock_bh(lock)
 
 #define spin_trylock_bh(lock)  __cond_lock(lock, _spin_trylock_bh(lock))
@@ -281,7 +261,6 @@ do {                                                                \
 
 #define spin_trylock_irqsave(lock, flags) \
 ({ \
-       BUILD_CHECK_IRQ_FLAGS(flags); \
        local_irq_save(flags); \
        spin_trylock(lock) ? \
        1 : ({ local_irq_restore(flags); 0; }); \