From d77c23ccfbc017c3037dc381a0615a595d76dfe3 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 27 Jul 2011 12:49:44 -0700
Subject: [PATCH] --- yaml --- r: 260823 b: refs/heads/master c:
 678624e401b0b7747762b5223fb23f86dcdacc93 h: refs/heads/master i:   260821:
 4c8fbde9430a393c06e030a093eb27b423b7f649   260819:
 a73b19918efc201730a5a4e85af74bd529fdfbc7   260815:
 7604fa2da2ec4b83e5e99bf3255b3b5f9bb24284 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 90afb6780682..ab07aeb5d759 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 09570f914914d2beb0db29c5a9c7344934f2fa8c
+refs/heads/master: 678624e401b0b7747762b5223fb23f86dcdacc93
diff --git a/trunk/arch/sparc/lib/atomic32.c b/trunk/arch/sparc/lib/atomic32.c
index 1a371f8ae0b0..8600eb2461b5 100644
--- a/trunk/arch/sparc/lib/atomic32.c
+++ b/trunk/arch/sparc/lib/atomic32.c
@@ -55,7 +55,7 @@ int atomic_cmpxchg(atomic_t *v, int old, int new)
 }
 EXPORT_SYMBOL(atomic_cmpxchg);
 
-int atomic_add_unless(atomic_t *v, int a, int u)
+int __atomic_add_unless(atomic_t *v, int a, int u)
 {
 	int ret;
 	unsigned long flags;
@@ -67,7 +67,7 @@ int atomic_add_unless(atomic_t *v, int a, int u)
 	spin_unlock_irqrestore(ATOMIC_HASH(v), flags);
 	return ret != u;
 }
-EXPORT_SYMBOL(atomic_add_unless);
+EXPORT_SYMBOL(__atomic_add_unless);
 
 /* Atomic operations are already serializing */
 void atomic_set(atomic_t *v, int i)