From 12fc6ac6d1469cceeb7a81f9c0c9959f11b0f580 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Thu, 31 May 2007 01:19:24 -0700
Subject: [PATCH] --- yaml --- r: 57178 b: refs/heads/master c:
 1fb8812ba5a4c34b680d4405216310233f3c7573 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/arch/sparc/lib/atomic32.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 57680efc3c1b..e7ae0f74f3f0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dbbe3cb8cff6b494ac2cba6a94dc7aabe7e5b635
+refs/heads/master: 1fb8812ba5a4c34b680d4405216310233f3c7573
diff --git a/trunk/arch/sparc/lib/atomic32.c b/trunk/arch/sparc/lib/atomic32.c
index 617d29832e19..cbddeb38ffda 100644
--- a/trunk/arch/sparc/lib/atomic32.c
+++ b/trunk/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;
 }