linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / kernel / spinlock.c

diff --git a/kernel/spinlock.c b/kernel/spinlock.c
index fb524b0..0375fcd 100644 (file)
--- a/kernel/spinlock.c
+++ b/kernel/spinlock.c
@@ -9,11 +9,11 @@
  * SMP and the DEBUG_SPINLOCK cases. (UP-nondebug inlines them)
  */
 
+#include <linux/config.h>
 #include <linux/linkage.h>
 #include <linux/preempt.h>
 #include <linux/spinlock.h>
 #include <linux/interrupt.h>
-#include <linux/debug_locks.h>
 #include <linux/module.h>
 
 /*
@@ -30,10 +30,8 @@ EXPORT_SYMBOL(generic__raw_read_trylock);
 int __lockfunc _spin_trylock(spinlock_t *lock)
 {
        preempt_disable();
-       if (_raw_spin_trylock(lock)) {
-               spin_acquire(&lock->dep_map, 0, 1, _RET_IP_);
+       if (_raw_spin_trylock(lock))
                return 1;
-       }
        
        preempt_enable();
        return 0;
@@ -43,10 +41,8 @@ EXPORT_SYMBOL(_spin_trylock);
 int __lockfunc _read_trylock(rwlock_t *lock)
 {
        preempt_disable();
-       if (_raw_read_trylock(lock)) {
-               rwlock_acquire_read(&lock->dep_map, 0, 1, _RET_IP_);
+       if (_raw_read_trylock(lock))
                return 1;
-       }
 
        preempt_enable();
        return 0;
@@ -56,28 +52,19 @@ EXPORT_SYMBOL(_read_trylock);
 int __lockfunc _write_trylock(rwlock_t *lock)
 {
        preempt_disable();
-       if (_raw_write_trylock(lock)) {
-               rwlock_acquire(&lock->dep_map, 0, 1, _RET_IP_);
+       if (_raw_write_trylock(lock))
                return 1;
-       }
 
        preempt_enable();
        return 0;
 }
 EXPORT_SYMBOL(_write_trylock);
 
-/*
- * If lockdep is enabled then we use the non-preemption spin-ops
- * even on CONFIG_PREEMPT, because lockdep assumes that interrupts are
- * not re-enabled during lock-acquire (which the preempt-spin-ops do):
- */
-#if !defined(CONFIG_PREEMPT) || !defined(CONFIG_SMP) || \
-       defined(CONFIG_DEBUG_LOCK_ALLOC)
+#if !defined(CONFIG_PREEMPT) || !defined(CONFIG_SMP)
 
 void __lockfunc _read_lock(rwlock_t *lock)
 {
        preempt_disable();
-       rwlock_acquire_read(&lock->dep_map, 0, 0, _RET_IP_);
        _raw_read_lock(lock);
 }
 EXPORT_SYMBOL(_read_lock);
@@ -88,17 +75,7 @@ unsigned long __lockfunc _spin_lock_irqsave(spinlock_t *lock)
 
        local_irq_save(flags);
        preempt_disable();
-       spin_acquire(&lock->dep_map, 0, 0, _RET_IP_);
-       /*
-        * On lockdep we dont want the hand-coded irq-enable of
-        * _raw_spin_lock_flags() code, because lockdep assumes
-        * that interrupts are not re-enabled during lock-acquire:
-        */
-#ifdef CONFIG_PROVE_LOCKING
-       _raw_spin_lock(lock);
-#else
        _raw_spin_lock_flags(lock, &flags);
-#endif
        return flags;
 }
 EXPORT_SYMBOL(_spin_lock_irqsave);
@@ -107,7 +84,6 @@ void __lockfunc _spin_lock_irq(spinlock_t *lock)
 {
        local_irq_disable();
        preempt_disable();
-       spin_acquire(&lock->dep_map, 0, 0, _RET_IP_);
        _raw_spin_lock(lock);
 }
 EXPORT_SYMBOL(_spin_lock_irq);
@@ -116,7 +92,6 @@ void __lockfunc _spin_lock_bh(spinlock_t *lock)
 {
        local_bh_disable();
        preempt_disable();
-       spin_acquire(&lock->dep_map, 0, 0, _RET_IP_);
        _raw_spin_lock(lock);
 }
 EXPORT_SYMBOL(_spin_lock_bh);
@@ -127,7 +102,6 @@ unsigned long __lockfunc _read_lock_irqsave(rwlock_t *lock)
 
        local_irq_save(flags);
        preempt_disable();
-       rwlock_acquire_read(&lock->dep_map, 0, 0, _RET_IP_);
        _raw_read_lock(lock);
        return flags;
 }
@@ -137,7 +111,6 @@ void __lockfunc _read_lock_irq(rwlock_t *lock)
 {
        local_irq_disable();
        preempt_disable();
-       rwlock_acquire_read(&lock->dep_map, 0, 0, _RET_IP_);
        _raw_read_lock(lock);
 }
 EXPORT_SYMBOL(_read_lock_irq);
@@ -146,7 +119,6 @@ void __lockfunc _read_lock_bh(rwlock_t *lock)
 {
        local_bh_disable();
        preempt_disable();
-       rwlock_acquire_read(&lock->dep_map, 0, 0, _RET_IP_);
        _raw_read_lock(lock);
 }
 EXPORT_SYMBOL(_read_lock_bh);
@@ -157,7 +129,6 @@ unsigned long __lockfunc _write_lock_irqsave(rwlock_t *lock)
 
        local_irq_save(flags);
        preempt_disable();
-       rwlock_acquire(&lock->dep_map, 0, 0, _RET_IP_);
        _raw_write_lock(lock);
        return flags;
 }
@@ -167,7 +138,6 @@ void __lockfunc _write_lock_irq(rwlock_t *lock)
 {
        local_irq_disable();
        preempt_disable();
-       rwlock_acquire(&lock->dep_map, 0, 0, _RET_IP_);
        _raw_write_lock(lock);
 }
 EXPORT_SYMBOL(_write_lock_irq);
@@ -176,7 +146,6 @@ void __lockfunc _write_lock_bh(rwlock_t *lock)
 {
        local_bh_disable();
        preempt_disable();
-       rwlock_acquire(&lock->dep_map, 0, 0, _RET_IP_);
        _raw_write_lock(lock);
 }
 EXPORT_SYMBOL(_write_lock_bh);
@@ -184,7 +153,6 @@ EXPORT_SYMBOL(_write_lock_bh);
 void __lockfunc _spin_lock(spinlock_t *lock)
 {
        preempt_disable();
-       spin_acquire(&lock->dep_map, 0, 0, _RET_IP_);
        _raw_spin_lock(lock);
 }
 
@@ -193,7 +161,6 @@ EXPORT_SYMBOL(_spin_lock);
 void __lockfunc _write_lock(rwlock_t *lock)
 {
        preempt_disable();
-       rwlock_acquire(&lock->dep_map, 0, 0, _RET_IP_);
        _raw_write_lock(lock);
 }
 
@@ -212,16 +179,16 @@ EXPORT_SYMBOL(_write_lock);
 #define BUILD_LOCK_OPS(op, locktype)                                   \
 void __lockfunc _##op##_lock(locktype##_t *lock)                       \
 {                                                                      \
+       preempt_disable();                                              \
        for (;;) {                                                      \
-               preempt_disable();                                      \
                if (likely(_raw_##op##_trylock(lock)))                  \
                        break;                                          \
                preempt_enable();                                       \
-                                                                       \
                if (!(lock)->break_lock)                                \
                        (lock)->break_lock = 1;                         \
                while (!op##_can_lock(lock) && (lock)->break_lock)      \
                        cpu_relax();                                    \
+               preempt_disable();                                      \
        }                                                               \
        (lock)->break_lock = 0;                                         \
 }                                                                      \
@@ -232,18 +199,19 @@ unsigned long __lockfunc _##op##_lock_irqsave(locktype##_t *lock) \
 {                                                                      \
        unsigned long flags;                                            \
                                                                        \
+       preempt_disable();                                              \
        for (;;) {                                                      \
-               preempt_disable();                                      \
                local_irq_save(flags);                                  \
                if (likely(_raw_##op##_trylock(lock)))                  \
                        break;                                          \
                local_irq_restore(flags);                               \
-               preempt_enable();                                       \
                                                                        \
+               preempt_enable();                                       \
                if (!(lock)->break_lock)                                \
                        (lock)->break_lock = 1;                         \
                while (!op##_can_lock(lock) && (lock)->break_lock)      \
                        cpu_relax();                                    \
+               preempt_disable();                                      \
        }                                                               \
        (lock)->break_lock = 0;                                         \
        return flags;                                                   \
@@ -289,22 +257,8 @@ BUILD_LOCK_OPS(write, rwlock);
 
 #endif /* CONFIG_PREEMPT */
 
-#ifdef CONFIG_DEBUG_LOCK_ALLOC
-
-void __lockfunc _spin_lock_nested(spinlock_t *lock, int subclass)
-{
-       preempt_disable();
-       spin_acquire(&lock->dep_map, subclass, 0, _RET_IP_);
-       _raw_spin_lock(lock);
-}
-
-EXPORT_SYMBOL(_spin_lock_nested);
-
-#endif
-
 void __lockfunc _spin_unlock(spinlock_t *lock)
 {
-       spin_release(&lock->dep_map, 1, _RET_IP_);
        _raw_spin_unlock(lock);
        preempt_enable();
 }
@@ -312,7 +266,6 @@ EXPORT_SYMBOL(_spin_unlock);
 
 void __lockfunc _write_unlock(rwlock_t *lock)
 {
-       rwlock_release(&lock->dep_map, 1, _RET_IP_);
        _raw_write_unlock(lock);
        preempt_enable();
 }
@@ -320,7 +273,6 @@ EXPORT_SYMBOL(_write_unlock);
 
 void __lockfunc _read_unlock(rwlock_t *lock)
 {
-       rwlock_release(&lock->dep_map, 1, _RET_IP_);
        _raw_read_unlock(lock);
        preempt_enable();
 }
@@ -328,7 +280,6 @@ EXPORT_SYMBOL(_read_unlock);
 
 void __lockfunc _spin_unlock_irqrestore(spinlock_t *lock, unsigned long flags)
 {
-       spin_release(&lock->dep_map, 1, _RET_IP_);
        _raw_spin_unlock(lock);
        local_irq_restore(flags);
        preempt_enable();
@@ -337,7 +288,6 @@ EXPORT_SYMBOL(_spin_unlock_irqrestore);
 
 void __lockfunc _spin_unlock_irq(spinlock_t *lock)
 {
-       spin_release(&lock->dep_map, 1, _RET_IP_);
        _raw_spin_unlock(lock);
        local_irq_enable();
        preempt_enable();
@@ -346,16 +296,14 @@ EXPORT_SYMBOL(_spin_unlock_irq);
 
 void __lockfunc _spin_unlock_bh(spinlock_t *lock)
 {
-       spin_release(&lock->dep_map, 1, _RET_IP_);
        _raw_spin_unlock(lock);
        preempt_enable_no_resched();
-       local_bh_enable_ip((unsigned long)__builtin_return_address(0));
+       local_bh_enable();
 }
 EXPORT_SYMBOL(_spin_unlock_bh);
 
 void __lockfunc _read_unlock_irqrestore(rwlock_t *lock, unsigned long flags)
 {
-       rwlock_release(&lock->dep_map, 1, _RET_IP_);
        _raw_read_unlock(lock);
        local_irq_restore(flags);
        preempt_enable();
@@ -364,7 +312,6 @@ EXPORT_SYMBOL(_read_unlock_irqrestore);
 
 void __lockfunc _read_unlock_irq(rwlock_t *lock)
 {
-       rwlock_release(&lock->dep_map, 1, _RET_IP_);
        _raw_read_unlock(lock);
        local_irq_enable();
        preempt_enable();
@@ -373,16 +320,14 @@ EXPORT_SYMBOL(_read_unlock_irq);
 
 void __lockfunc _read_unlock_bh(rwlock_t *lock)
 {
-       rwlock_release(&lock->dep_map, 1, _RET_IP_);
        _raw_read_unlock(lock);
        preempt_enable_no_resched();
-       local_bh_enable_ip((unsigned long)__builtin_return_address(0));
+       local_bh_enable();
 }
 EXPORT_SYMBOL(_read_unlock_bh);
 
 void __lockfunc _write_unlock_irqrestore(rwlock_t *lock, unsigned long flags)
 {
-       rwlock_release(&lock->dep_map, 1, _RET_IP_);
        _raw_write_unlock(lock);
        local_irq_restore(flags);
        preempt_enable();
@@ -391,7 +336,6 @@ EXPORT_SYMBOL(_write_unlock_irqrestore);
 
 void __lockfunc _write_unlock_irq(rwlock_t *lock)
 {
-       rwlock_release(&lock->dep_map, 1, _RET_IP_);
        _raw_write_unlock(lock);
        local_irq_enable();
        preempt_enable();
@@ -400,10 +344,9 @@ EXPORT_SYMBOL(_write_unlock_irq);
 
 void __lockfunc _write_unlock_bh(rwlock_t *lock)
 {
-       rwlock_release(&lock->dep_map, 1, _RET_IP_);
        _raw_write_unlock(lock);
        preempt_enable_no_resched();
-       local_bh_enable_ip((unsigned long)__builtin_return_address(0));
+       local_bh_enable();
 }
 EXPORT_SYMBOL(_write_unlock_bh);
 
@@ -411,13 +354,11 @@ int __lockfunc _spin_trylock_bh(spinlock_t *lock)
 {
        local_bh_disable();
        preempt_disable();
-       if (_raw_spin_trylock(lock)) {
-               spin_acquire(&lock->dep_map, 0, 1, _RET_IP_);
+       if (_raw_spin_trylock(lock))
                return 1;
-       }
 
        preempt_enable_no_resched();
-       local_bh_enable_ip((unsigned long)__builtin_return_address(0));
+       local_bh_enable();
        return 0;
 }
 EXPORT_SYMBOL(_spin_trylock_bh);