diff options
| author | Guan Xuetao <gxt@mprc.pku.edu.cn> | 2012-06-14 15:39:48 +0800 |
|---|---|---|
| committer | Zefan Li <lizefan@huawei.com> | 2014-09-25 11:49:18 +0800 |
| commit | 92a6e26fd0c8ba921890dd6adc0166f5ef927f8c (patch) | |
| tree | c006595a1e13ef403dd94f47595e0004e1c63057 | |
| parent | 4e36063eb13e743f1fdac0a65055c3f5fe28e387 (diff) | |
UniCore32-bugfix: fix mismatch return value of __xchg_bad_pointer
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>
| -rw-r--r-- | arch/unicore32/include/asm/cmpxchg.h | 2 |
1 files changed, 1 insertions, 1 deletions
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; |