From 99ddde1bf827565e375c35acee9cac5f40ee3d3e Mon Sep 17 00:00:00 2001
From: Richard Kuo <rkuo@codeaurora.org>
Date: Thu, 21 Mar 2013 18:24:19 -0500
Subject: [PATCH] --- yaml --- r: 367937 b: refs/heads/master c:
 e0025a72c37ca404fbf31d569439c20bfb04295e h: refs/heads/master i:   367935:
 2717a0ee70d97101dfdf9bff30b19a72ebfa644a v: v3

---
 [refs]                                  |  2 +-
 trunk/arch/hexagon/include/asm/atomic.h | 20 +++++++++++---------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 8fa1379f160e..3d4581dfe4d5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 22493cfd78e4db0ba9c9f46dac4757bee5a0294a
+refs/heads/master: e0025a72c37ca404fbf31d569439c20bfb04295e
diff --git a/trunk/arch/hexagon/include/asm/atomic.h b/trunk/arch/hexagon/include/asm/atomic.h
index 468fbb0781cd..c6670390d255 100644
--- a/trunk/arch/hexagon/include/asm/atomic.h
+++ b/trunk/arch/hexagon/include/asm/atomic.h
@@ -117,35 +117,37 @@ static inline int atomic_sub_return(int i, atomic_t *v)
 #define atomic_sub(i, v) atomic_sub_return(i, (v))
 
 /**
- * atomic_add_unless - add unless the number is a given value
+ * __atomic_add_unless - add unless the number is a given value
  * @v: pointer to value
  * @a: amount to add
  * @u: unless value is equal to u
  *
- * Returns 1 if the add happened, 0 if it didn't.
+ * Returns old value.
+ *
  */
+
 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
 {
-	int output, __oldval;
+	int __oldval;
+	register int tmp;
+
 	asm volatile(
 		"1:	%0 = memw_locked(%2);"
 		"	{"
 		"		p3 = cmp.eq(%0, %4);"
 		"		if (p3.new) jump:nt 2f;"
-		"		%0 = add(%0, %3);"
-		"		%1 = #0;"
+		"		%1 = add(%0, %3);"
 		"	}"
-		"	memw_locked(%2, p3) = %0;"
+		"	memw_locked(%2, p3) = %1;"
 		"	{"
 		"		if !p3 jump 1b;"
-		"		%1 = #1;"
 		"	}"
 		"2:"
-		: "=&r" (__oldval), "=&r" (output)
+		: "=&r" (__oldval), "=&r" (tmp)
 		: "r" (v), "r" (a), "r" (u)
 		: "memory", "p3"
 	);
-	return output;
+	return __oldval;
 }
 
 #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)