diff options
| author | Pan Xinhui <xinhui.pan@linux.vnet.ibm.com> | 2016-04-20 08:41:00 +0200 |
|---|---|---|
| committer | Rich Felker <dalias@libc.org> | 2016-07-31 05:33:32 +0200 |
| commit | ff18143ceed3424b7d6cdb8659b9692fa734f0d8 (patch) | |
| tree | 4b7fe3f1cf044b116366ccaab61c35a82d18ff80 /arch/sh | |
| parent | Merge tag 'nfs-for-4.8-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs (diff) | |
| download | linux-ff18143ceed3424b7d6cdb8659b9692fa734f0d8.tar.xz linux-ff18143ceed3424b7d6cdb8659b9692fa734f0d8.zip | |
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>
Diffstat (limited to 'arch/sh')
| -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 |