From bc01e53412ea32465eeb08bb923d89bb6d1bc899 Mon Sep 17 00:00:00 2001
From: Guan Xuetao <gxt@mprc.pku.edu.cn>
Date: Thu, 14 Jun 2012 15:39:48 +0800
Subject: [PATCH] --- yaml --- r: 335662 b: refs/heads/master c:
 195d4577d1d7ab1f0398b3190547c116b56f435f h: refs/heads/master v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/unicore32/include/asm/cmpxchg.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8cf723793f0f..bb5962a9feda 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 446d141e1c84d34c70592b53443b06533703c324
+refs/heads/master: 195d4577d1d7ab1f0398b3190547c116b56f435f
diff --git a/trunk/arch/unicore32/include/asm/cmpxchg.h b/trunk/arch/unicore32/include/asm/cmpxchg.h
index df4d5acfd19f..8e797ad4fa24 100644
--- a/trunk/arch/unicore32/include/asm/cmpxchg.h
+++ b/trunk/arch/unicore32/include/asm/cmpxchg.h
@@ -35,7 +35,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr,
 			: "memory", "cc");
 		break;
 	default:
-		ret = __xchg_bad_pointer();
+		__xchg_bad_pointer();
 	}
 
 	return ret;