Messages in this thread Patch in this message | | | From | Zefan Li <> | Subject | [PATCH 3.4 42/45] UniCore32-bugfix: fix mismatch return value of __xchg_bad_pointer | Date | Tue, 23 Sep 2014 10:31:44 +0800 |
| |
From: Guan Xuetao <gxt@mprc.pku.edu.cn>
3.4.104-rc1 review patch. If anyone has any objections, please let me know.
------------------
commit 195d4577d1d7ab1f0398b3190547c116b56f435f upstream.
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> Cc: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Zefan Li <lizefan@huawei.com> --- arch/unicore32/include/asm/cmpxchg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/unicore32/include/asm/cmpxchg.h b/arch/unicore32/include/asm/cmpxchg.h index df4d5ac..8e797ad 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; -- 1.7.9.5
| |