4.7-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Pan Xinhui <xinhui....@linux.vnet.ibm.com>

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....@linux.vnet.ibm.com>
Acked-by: Michael S. Tsirkin <m...@redhat.com>
Signed-off-by: Rich Felker <dal...@libc.org>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>

---
 arch/sh/include/asm/cmpxchg-xchg.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- 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(volatil
        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


Reply via email to