MIPS: BCM63xx: Add serial driver for bcm63xx integrated UART.

[safe/jmp/linux-2.6] / include / linux / spinlock.h

diff --git a/include/linux/spinlock.h b/include/linux/spinlock.h
index da76a06..f0ca7a7 100644 (file)
--- a/include/linux/spinlock.h
+++ b/include/linux/spinlock.h
@@ -259,50 +259,16 @@ static inline void smp_mb__after_lock(void) { smp_mb(); }
 
 #define spin_lock_irq(lock)            _spin_lock_irq(lock)
 #define spin_lock_bh(lock)             _spin_lock_bh(lock)
-
 #define read_lock_irq(lock)            _read_lock_irq(lock)
 #define read_lock_bh(lock)             _read_lock_bh(lock)
-
 #define write_lock_irq(lock)           _write_lock_irq(lock)
 #define write_lock_bh(lock)            _write_lock_bh(lock)
-
-/*
- * We inline the unlock functions in the nondebug case:
- */
-#if defined(CONFIG_DEBUG_SPINLOCK) || defined(CONFIG_PREEMPT) || \
-       !defined(CONFIG_SMP)
-# define spin_unlock(lock)             _spin_unlock(lock)
-# define read_unlock(lock)             _read_unlock(lock)
-# define write_unlock(lock)            _write_unlock(lock)
-# define spin_unlock_irq(lock)         _spin_unlock_irq(lock)
-# define read_unlock_irq(lock)         _read_unlock_irq(lock)
-# define write_unlock_irq(lock)                _write_unlock_irq(lock)
-#else
-# define spin_unlock(lock) \
-    do {__raw_spin_unlock(&(lock)->raw_lock); __release(lock); } while (0)
-# define read_unlock(lock) \
-    do {__raw_read_unlock(&(lock)->raw_lock); __release(lock); } while (0)
-# define write_unlock(lock) \
-    do {__raw_write_unlock(&(lock)->raw_lock); __release(lock); } while (0)
-# define spin_unlock_irq(lock)                 \
-do {                                           \
-       __raw_spin_unlock(&(lock)->raw_lock);   \
-       __release(lock);                        \
-       local_irq_enable();                     \
-} while (0)
-# define read_unlock_irq(lock)                 \
-do {                                           \
-       __raw_read_unlock(&(lock)->raw_lock);   \
-       __release(lock);                        \
-       local_irq_enable();                     \
-} while (0)
-# define write_unlock_irq(lock)                        \
-do {                                           \
-       __raw_write_unlock(&(lock)->raw_lock);  \
-       __release(lock);                        \
-       local_irq_enable();                     \
-} while (0)
-#endif
+#define spin_unlock(lock)              _spin_unlock(lock)
+#define read_unlock(lock)              _read_unlock(lock)
+#define write_unlock(lock)             _write_unlock(lock)
+#define spin_unlock_irq(lock)          _spin_unlock_irq(lock)
+#define read_unlock_irq(lock)          _read_unlock_irq(lock)
+#define write_unlock_irq(lock)         _write_unlock_irq(lock)
 
 #define spin_unlock_irqrestore(lock, flags)            \
        do {                                            \