summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPan Xinhui <xinhui.pan@linux.vnet.ibm.com>2016-04-20 14:41:00 +0800
committerRich Felker <dalias@libc.org>2016-04-28 20:47:56 +0000
commit544f1e213c2ccf6b7a7358f1a6f8b99a41f7c70b (patch)
treeba1f33b547278b6efab6489cf5fc11182aa17cbd
parentedd054cfdb4b9cfb25e7f4d940f89be3488cfa86 (diff)
downloadlinux-sh-544f1e213c2ccf6b7a7358f1a6f8b99a41f7c70b.tar.gz
sh: cmpxchg: fix a bit shift bug in big_endian os
Correct bitoff in big endian OS. Current code works correctly for 1 byte but not for 2 bytes. Fixes: 3226aad81aa6 ("sh: support 1 and 2 byte xchg") Signed-off-by: Pan Xinhui <xinhui.pan@linux.vnet.ibm.com> Acked-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Rich Felker <dalias@libc.org>
-rw-r--r--arch/sh/include/asm/cmpxchg-xchg.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/include/asm/cmpxchg-xchg.h b/arch/sh/include/asm/cmpxchg-xchg.h
index 7219719c23a3..1e881f5db659 100644
--- a/arch/sh/include/asm/cmpxchg-xchg.h
+++ b/arch/sh/include/asm/cmpxchg-xchg.h
@@ -21,7 +21,7 @@ static inline u32 __xchg_cmpxchg(volatile void *ptr, u32 x, int size)
int off = (unsigned long)ptr % sizeof(u32);
volatile u32 *p = ptr - off;
#ifdef __BIG_ENDIAN
- int bitoff = (sizeof(u32) - 1 - off) * BITS_PER_BYTE;
+ int bitoff = (sizeof(u32) - size - off) * BITS_PER_BYTE;
#else
int bitoff = off * BITS_PER_BYTE;
#endif