Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-2.6] / arch / sparc / lib / atomic32.c

diff --git a/arch/sparc/lib/atomic32.c b/arch/sparc/lib/atomic32.c
index 617d29832e192fc1a0e7258c374886bd592d225f..cbddeb38ffdab2bf5f25562190dd833bf2f9ded4 100644 (file)
--- a/arch/sparc/lib/atomic32.c
+++ b/arch/sparc/lib/atomic32.c
@@ -124,10 +124,10 @@ unsigned long __cmpxchg_u32(volatile u32 *ptr, u32 old, u32 new)
        unsigned long flags;
        u32 prev;
 
-       spin_lock_irqsave(ATOMIC_HASH(addr), flags);
+       spin_lock_irqsave(ATOMIC_HASH(ptr), flags);
        if ((prev = *ptr) == old)
                *ptr = new;
-       spin_unlock_irqrestore(ATOMIC_HASH(addr), flags);
+       spin_unlock_irqrestore(ATOMIC_HASH(ptr), flags);
 
        return (unsigned long)prev;
 }