upgrade to linux 2.6.10-1.12_FC2

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

diff --git a/include/linux/spinlock.h b/include/linux/spinlock.h
index eb02c8b..fca9c3c 100644 (file)
--- a/include/linux/spinlock.h
+++ b/include/linux/spinlock.h
@@ -27,54 +27,60 @@
         extra                                   \
         ".ifndef " LOCK_SECTION_NAME "\n\t"     \
         LOCK_SECTION_NAME ":\n\t"               \
-        ".endif\n\t"
+        ".endif\n"
 
 #define LOCK_SECTION_END                        \
         ".previous\n\t"
 
+#define __lockfunc fastcall __attribute__((section(".spinlock.text")))
+
 /*
  * If CONFIG_SMP is set, pull in the _raw_* definitions
  */
 #ifdef CONFIG_SMP
 #include <asm/spinlock.h>
 
-#define __lockfunc fastcall __attribute__((section(".spinlock.text")))
-
 int __lockfunc _spin_trylock(spinlock_t *lock);
 int __lockfunc _write_trylock(rwlock_t *lock);
-void __lockfunc _spin_lock(spinlock_t *lock);
-void __lockfunc _write_lock(rwlock_t *lock);
-void __lockfunc _spin_lock(spinlock_t *lock);
-void __lockfunc _read_lock(rwlock_t *lock);
-void __lockfunc _spin_unlock(spinlock_t *lock);
-void __lockfunc _write_unlock(rwlock_t *lock);
-void __lockfunc _read_unlock(rwlock_t *lock);
-unsigned long __lockfunc _spin_lock_irqsave(spinlock_t *lock);
-unsigned long __lockfunc _read_lock_irqsave(rwlock_t *lock);
-unsigned long __lockfunc _write_lock_irqsave(rwlock_t *lock);
-void __lockfunc _spin_lock_irq(spinlock_t *lock);
-void __lockfunc _spin_lock_bh(spinlock_t *lock);
-void __lockfunc _read_lock_irq(rwlock_t *lock);
-void __lockfunc _read_lock_bh(rwlock_t *lock);
-void __lockfunc _write_lock_irq(rwlock_t *lock);
-void __lockfunc _write_lock_bh(rwlock_t *lock);
-void __lockfunc _spin_unlock_irqrestore(spinlock_t *lock, unsigned long flags);
-void __lockfunc _spin_unlock_irq(spinlock_t *lock);
-void __lockfunc _spin_unlock_bh(spinlock_t *lock);
-void __lockfunc _read_unlock_irqrestore(rwlock_t *lock, unsigned long flags);
-void __lockfunc _read_unlock_irq(rwlock_t *lock);
-void __lockfunc _read_unlock_bh(rwlock_t *lock);
-void __lockfunc _write_unlock_irqrestore(rwlock_t *lock, unsigned long flags);
-void __lockfunc _write_unlock_irq(rwlock_t *lock);
-void __lockfunc _write_unlock_bh(rwlock_t *lock);
+
+void __lockfunc _spin_lock(spinlock_t *lock)   __acquires(spinlock_t);
+void __lockfunc _read_lock(rwlock_t *lock)     __acquires(rwlock_t);
+void __lockfunc _write_lock(rwlock_t *lock)    __acquires(rwlock_t);
+
+void __lockfunc _spin_unlock(spinlock_t *lock) __releases(spinlock_t);
+void __lockfunc _read_unlock(rwlock_t *lock)   __releases(rwlock_t);
+void __lockfunc _write_unlock(rwlock_t *lock)  __releases(rwlock_t);
+
+unsigned long __lockfunc _spin_lock_irqsave(spinlock_t *lock)  __acquires(spinlock_t);
+unsigned long __lockfunc _read_lock_irqsave(rwlock_t *lock)    __acquires(rwlock_t);
+unsigned long __lockfunc _write_lock_irqsave(rwlock_t *lock)   __acquires(rwlock_t);
+
+void __lockfunc _spin_lock_irq(spinlock_t *lock)       __acquires(spinlock_t);
+void __lockfunc _spin_lock_bh(spinlock_t *lock)                __acquires(spinlock_t);
+void __lockfunc _read_lock_irq(rwlock_t *lock)         __acquires(rwlock_t);
+void __lockfunc _read_lock_bh(rwlock_t *lock)          __acquires(rwlock_t);
+void __lockfunc _write_lock_irq(rwlock_t *lock)                __acquires(rwlock_t);
+void __lockfunc _write_lock_bh(rwlock_t *lock)         __acquires(rwlock_t);
+
+void __lockfunc _spin_unlock_irqrestore(spinlock_t *lock, unsigned long flags) __releases(spinlock_t);
+void __lockfunc _spin_unlock_irq(spinlock_t *lock)                             __releases(spinlock_t);
+void __lockfunc _spin_unlock_bh(spinlock_t *lock)                              __releases(spinlock_t);
+void __lockfunc _read_unlock_irqrestore(rwlock_t *lock, unsigned long flags)   __releases(rwlock_t);
+void __lockfunc _read_unlock_irq(rwlock_t *lock)                               __releases(rwlock_t);
+void __lockfunc _read_unlock_bh(rwlock_t *lock)                                        __releases(rwlock_t);
+void __lockfunc _write_unlock_irqrestore(rwlock_t *lock, unsigned long flags)  __releases(rwlock_t);
+void __lockfunc _write_unlock_irq(rwlock_t *lock)                              __releases(rwlock_t);
+void __lockfunc _write_unlock_bh(rwlock_t *lock)                               __releases(rwlock_t);
+
 int __lockfunc _spin_trylock_bh(spinlock_t *lock);
 int in_lock_functions(unsigned long addr);
+
 #else
 
 #define in_lock_functions(ADDR) 0
 
 #if !defined(CONFIG_PREEMPT) && !defined(CONFIG_DEBUG_SPINLOCK)
-# define atomic_dec_and_lock(atomic,lock) atomic_dec_and_test(atomic)
+# define _atomic_dec_and_lock(atomic,lock) atomic_dec_and_test(atomic)
 # define ATOMIC_DEC_AND_LOCK
 #endif
 
@@ -104,6 +110,7 @@ typedef struct {
 #define CHECK_LOCK(x) \
        do { \
                if ((x)->magic != SPINLOCK_MAGIC) { \
+                       dump_stack(); \
                        panic("%s:%d: spin_is_locked on uninitialized spinlock %p.\n", \
                                        __FILE__, __LINE__, (x)); \
                } \
@@ -114,6 +121,7 @@ typedef struct {
                CHECK_LOCK(x); \
                if ((x)->lock&&(x)->babble) { \
                        (x)->babble--; \
+                       dump_stack(); \
                        panic("%s:%d: spin_lock(%s:%p) already locked by %s/%d\n", \
                                        __FILE__,__LINE__, (x)->module, \
                                        (x), (x)->owner, (x)->oline); \
@@ -170,6 +178,7 @@ typedef struct {
                CHECK_LOCK(x); \
                if (!(x)->lock&&(x)->babble) { \
                        (x)->babble--; \
+                       dump_stack(); \
                        panic("%s:%d: spin_unlock(%s:%p) not locked\n", \
                                        __FILE__,__LINE__, (x)->module, (x));\
                } \
@@ -229,36 +238,42 @@ typedef struct {
 do { \
        preempt_disable(); \
        _raw_spin_lock(lock); \
+       __acquire(lock); \
 } while(0)
 
 #define _write_lock(lock) \
 do { \
        preempt_disable(); \
        _raw_write_lock(lock); \
+       __acquire(lock); \
 } while(0)
  
 #define _read_lock(lock)       \
 do { \
        preempt_disable(); \
        _raw_read_lock(lock); \
+       __acquire(lock); \
 } while(0)
 
 #define _spin_unlock(lock) \
 do { \
        _raw_spin_unlock(lock); \
        preempt_enable(); \
+       __release(lock); \
 } while (0)
 
 #define _write_unlock(lock) \
 do { \
        _raw_write_unlock(lock); \
        preempt_enable(); \
+       __release(lock); \
 } while(0)
 
 #define _read_unlock(lock) \
 do { \
        _raw_read_unlock(lock); \
        preempt_enable(); \
+       __release(lock); \
 } while(0)
 
 #define _spin_lock_irqsave(lock, flags) \
@@ -266,6 +281,7 @@ do {        \
        local_irq_save(flags); \
        preempt_disable(); \
        _raw_spin_lock(lock); \
+       __acquire(lock); \
 } while (0)
 
 #define _spin_lock_irq(lock) \
@@ -273,6 +289,7 @@ do { \
        local_irq_disable(); \
        preempt_disable(); \
        _raw_spin_lock(lock); \
+       __acquire(lock); \
 } while (0)
 
 #define _spin_lock_bh(lock) \
@@ -280,6 +297,7 @@ do { \
        local_bh_disable(); \
        preempt_disable(); \
        _raw_spin_lock(lock); \
+       __acquire(lock); \
 } while (0)
 
 #define _read_lock_irqsave(lock, flags) \
@@ -287,6 +305,7 @@ do {        \
        local_irq_save(flags); \
        preempt_disable(); \
        _raw_read_lock(lock); \
+       __acquire(lock); \
 } while (0)
 
 #define _read_lock_irq(lock) \
@@ -294,6 +313,7 @@ do { \
        local_irq_disable(); \
        preempt_disable(); \
        _raw_read_lock(lock); \
+       __acquire(lock); \
 } while (0)
 
 #define _read_lock_bh(lock) \
@@ -301,6 +321,7 @@ do { \
        local_bh_disable(); \
        preempt_disable(); \
        _raw_read_lock(lock); \
+       __acquire(lock); \
 } while (0)
 
 #define _write_lock_irqsave(lock, flags) \
@@ -308,6 +329,7 @@ do {        \
        local_irq_save(flags); \
        preempt_disable(); \
        _raw_write_lock(lock); \
+       __acquire(lock); \
 } while (0)
 
 #define _write_lock_irq(lock) \
@@ -315,6 +337,7 @@ do { \
        local_irq_disable(); \
        preempt_disable(); \
        _raw_write_lock(lock); \
+       __acquire(lock); \
 } while (0)
 
 #define _write_lock_bh(lock) \
@@ -322,6 +345,7 @@ do { \
        local_bh_disable(); \
        preempt_disable(); \
        _raw_write_lock(lock); \
+       __acquire(lock); \
 } while (0)
 
 #define _spin_unlock_irqrestore(lock, flags) \
@@ -329,12 +353,7 @@ do { \
        _raw_spin_unlock(lock); \
        local_irq_restore(flags); \
        preempt_enable(); \
-} while (0)
-
-#define _raw_spin_unlock_irqrestore(lock, flags) \
-do { \
-       _raw_spin_unlock(lock); \
-       local_irq_restore(flags); \
+       __release(lock); \
 } while (0)
 
 #define _spin_unlock_irq(lock) \
@@ -342,6 +361,7 @@ do { \
        _raw_spin_unlock(lock); \
        local_irq_enable(); \
        preempt_enable(); \
+       __release(lock); \
 } while (0)
 
 #define _spin_unlock_bh(lock) \
@@ -349,6 +369,7 @@ do { \
        _raw_spin_unlock(lock); \
        preempt_enable(); \
        local_bh_enable(); \
+       __release(lock); \
 } while (0)
 
 #define _write_unlock_bh(lock) \
@@ -356,6 +377,7 @@ do { \
        _raw_write_unlock(lock); \
        preempt_enable(); \
        local_bh_enable(); \
+       __release(lock); \
 } while (0)
 
 #define _read_unlock_irqrestore(lock, flags) \
@@ -363,6 +385,7 @@ do { \
        _raw_read_unlock(lock); \
        local_irq_restore(flags); \
        preempt_enable(); \
+       __release(lock); \
 } while (0)
 
 #define _write_unlock_irqrestore(lock, flags) \
@@ -370,6 +393,7 @@ do { \
        _raw_write_unlock(lock); \
        local_irq_restore(flags); \
        preempt_enable(); \
+       __release(lock); \
 } while (0)
 
 #define _read_unlock_irq(lock) \
@@ -377,6 +401,7 @@ do { \
        _raw_read_unlock(lock); \
        local_irq_enable();     \
        preempt_enable();       \
+       __release(lock); \
 } while (0)
 
 #define _read_unlock_bh(lock)  \
@@ -384,6 +409,7 @@ do { \
        _raw_read_unlock(lock); \
        local_bh_enable();      \
        preempt_enable();       \
+       __release(lock); \
 } while (0)
 
 #define _write_unlock_irq(lock)        \
@@ -391,6 +417,7 @@ do { \
        _raw_write_unlock(lock);        \
        local_irq_enable();     \
        preempt_enable();       \
+       __release(lock); \
 } while (0)
 
 #endif /* !SMP */
@@ -400,8 +427,8 @@ do { \
  * regardless of whether CONFIG_SMP or CONFIG_PREEMPT are set. The various
  * methods are defined as nops in the case they are not required.
  */
-#define spin_trylock(lock)     _spin_trylock(lock)
-#define write_trylock(lock)    _write_trylock(lock)
+#define spin_trylock(lock)     __cond_lock(_spin_trylock(lock))
+#define write_trylock(lock)    __cond_lock(_write_trylock(lock))
 
 /* Where's read_trylock? */
 
@@ -442,7 +469,7 @@ do { \
 #define write_unlock_irq(lock)                 _write_unlock_irq(lock)
 #define write_unlock_bh(lock)                  _write_unlock_bh(lock)
 
-#define spin_trylock_bh(lock)                  _spin_trylock_bh(lock)
+#define spin_trylock_bh(lock)                  __cond_lock(_spin_trylock_bh(lock))
 
 #define spin_trylock_irq(lock) \
 ({ \
@@ -472,9 +499,11 @@ extern int  _metered_write_trylock(rwlock_t *lock);
 /* "lock on reference count zero" */
 #ifndef ATOMIC_DEC_AND_LOCK
 #include <asm/atomic.h>
-extern int atomic_dec_and_lock(atomic_t *atomic, spinlock_t *lock);
+extern int _atomic_dec_and_lock(atomic_t *atomic, spinlock_t *lock);
 #endif
 
+#define atomic_dec_and_lock(atomic,lock) __cond_lock(_atomic_dec_and_lock(atomic,lock))
+
 /*
  *  bit-based spin_lock()
  *
@@ -497,6 +526,7 @@ static inline void bit_spin_lock(int bitnum, unsigned long *addr)
                        cpu_relax();
        }
 #endif
+       __acquire(bitlock);
 }
 
 /*
@@ -504,18 +534,15 @@ static inline void bit_spin_lock(int bitnum, unsigned long *addr)
  */
 static inline int bit_spin_trylock(int bitnum, unsigned long *addr)
 {
+       preempt_disable();      
 #if defined(CONFIG_SMP) || defined(CONFIG_DEBUG_SPINLOCK)
-       int ret;
-
-       preempt_disable();
-       ret = !test_and_set_bit(bitnum, addr);
-       if (!ret)
+       if (test_and_set_bit(bitnum, addr)) {
                preempt_enable();
-       return ret;
-#else
-       preempt_disable();
-       return 1;
+               return 0;
+       }
 #endif
+       __acquire(bitlock);
+       return 1;
 }
 
 /*
@@ -529,6 +556,7 @@ static inline void bit_spin_unlock(int bitnum, unsigned long *addr)
        clear_bit(bitnum, addr);
 #endif
        preempt_enable();
+       __release(bitlock);
 }
 
 /*