vserver 1.9.5.x5

[linux-2.6.git] / arch / parisc / lib / bitops.c

diff --git a/arch/parisc/lib/bitops.c b/arch/parisc/lib/bitops.c
index 4c077fc..2de182f 100644 (file)
--- a/arch/parisc/lib/bitops.c
+++ b/arch/parisc/lib/bitops.c
@@ -13,8 +13,8 @@
 #include <asm/atomic.h>
 
 #ifdef CONFIG_SMP
-atomic_lock_t __atomic_hash[ATOMIC_HASH_SIZE] __lock_aligned = {
-       [0 ... (ATOMIC_HASH_SIZE-1)]  = (atomic_lock_t) { { 1, 1, 1, 1 } }
+spinlock_t __atomic_hash[ATOMIC_HASH_SIZE] __lock_aligned = {
+       [0 ... (ATOMIC_HASH_SIZE-1)]  = SPIN_LOCK_UNLOCKED
 };
 #endif
 
@@ -23,10 +23,10 @@ unsigned long __xchg64(unsigned long x, unsigned long *ptr)
 {
        unsigned long temp, flags;
 
-       atomic_spin_lock_irqsave(ATOMIC_HASH(ptr), flags);
+       _atomic_spin_lock_irqsave(ptr, flags);
        temp = *ptr;
        *ptr = x;
-       atomic_spin_unlock_irqrestore(ATOMIC_HASH(ptr), flags);
+       _atomic_spin_unlock_irqrestore(ptr, flags);
        return temp;
 }
 #endif
@@ -36,10 +36,10 @@ unsigned long __xchg32(int x, int *ptr)
        unsigned long flags;
        long temp;
 
-       atomic_spin_lock_irqsave(ATOMIC_HASH(ptr), flags);
+       _atomic_spin_lock_irqsave(ptr, flags);
        temp = (long) *ptr;     /* XXX - sign extension wanted? */
        *ptr = x;
-       atomic_spin_unlock_irqrestore(ATOMIC_HASH(ptr), flags);
+       _atomic_spin_unlock_irqrestore(ptr, flags);
        return (unsigned long)temp;
 }
 
@@ -49,10 +49,10 @@ unsigned long __xchg8(char x, char *ptr)
        unsigned long flags;
        long temp;
 
-       atomic_spin_lock_irqsave(ATOMIC_HASH(ptr), flags);
+       _atomic_spin_lock_irqsave(ptr, flags);
        temp = (long) *ptr;     /* XXX - sign extension wanted? */
        *ptr = x;
-       atomic_spin_unlock_irqrestore(ATOMIC_HASH(ptr), flags);
+       _atomic_spin_unlock_irqrestore(ptr, flags);
        return (unsigned long)temp;
 }
 
@@ -63,10 +63,10 @@ unsigned long __cmpxchg_u64(volatile unsigned long *ptr, unsigned long old, unsi
        unsigned long flags;
        unsigned long prev;
 
-       atomic_spin_lock_irqsave(ATOMIC_HASH(ptr), flags);
+       _atomic_spin_lock_irqsave(ptr, flags);
        if ((prev = *ptr) == old)
                *ptr = new;
-       atomic_spin_unlock_irqrestore(ATOMIC_HASH(ptr), flags);
+       _atomic_spin_unlock_irqrestore(ptr, flags);
        return prev;
 }
 #endif
@@ -76,9 +76,9 @@ unsigned long __cmpxchg_u32(volatile unsigned int *ptr, unsigned int old, unsign
        unsigned long flags;
        unsigned int prev;
 
-       atomic_spin_lock_irqsave(ATOMIC_HASH(ptr), flags);
+       _atomic_spin_lock_irqsave(ptr, flags);
        if ((prev = *ptr) == old)
                *ptr = new;
-       atomic_spin_unlock_irqrestore(ATOMIC_HASH(ptr), flags);
+       _atomic_spin_unlock_irqrestore(ptr, flags);
        return (unsigned long)prev;
 }