diff options
| author | Pan Xinhui <xinhui.pan@linux.vnet.ibm.com> | 2016-04-20 14:41:00 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-24 10:09:39 +0200 |
| commit | c0fd2000f763cded915a196a78668db9991a124c (patch) | |
| tree | 179c969077354ff0cf076189a093224b67d79755 | |
| parent | b93b47fdce1b846981c0cf1c186226c21630fcd9 (diff) | |
| download | lwn-c0fd2000f763cded915a196a78668db9991a124c.tar.gz lwn-c0fd2000f763cded915a196a78668db9991a124c.zip | |
sh: cmpxchg: fix a bit shift bug in big_endian os
commit ff18143ceed3424b7d6cdb8659b9692fa734f0d8 upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | arch/sh/include/asm/cmpxchg-xchg.h | 2 |
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 |