From: Guan Xuetao <gxt@mprc.pku.edu.cn>
Date: Thu, 14 Jun 2012 07:39:48 +0000 (+0800)
Subject: UniCore32-bugfix: fix mismatch return value of __xchg_bad_pointer
X-Git-Tag: next-20121030~91^2~6
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=96fbd8aae7582aca9dfba7c66890cdbf4c82c0f1;p=karo-tx-linux.git

UniCore32-bugfix: fix mismatch return value of __xchg_bad_pointer

When disintegrate system.h, I left an error in asm/cmpxchg.h, which
will result in following error:

arch/unicore32/include/asm/cmpxchg.h: In function '__xchg':
arch/unicore32/include/asm/cmpxchg.h:38: error: void value not ignored as it ought to be

Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
---

diff --git a/arch/unicore32/include/asm/cmpxchg.h b/arch/unicore32/include/asm/cmpxchg.h
index df4d5acfd19f..8e797ad4fa24 100644
--- a/arch/unicore32/include/asm/cmpxchg.h
+++ b/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;