| Message ID | 5715D72D.7060501@linux.vnet.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Apr 19, 2016 at 02:58:53PM +0800, Pan Xinhui wrote: > From: Pan Xinhui <xinhui.pan@linux.vnet.ibm.com> > > Correct bitoff in big endian OS. > > Fixes: 3226aad81aa6 ("sh: support 1 and 2 byte xchg") > Signed-off-by: Pan Xinhui <xinhui.pan@linux.vnet.ibm.com> I would add: current code works correctly for 1 byte but not for 2 bytes. Acked-by: Michael S. Tsirkin <mst@redhat.com> > --- > arch/sh/include/asm/cmpxchg-xchg.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/sh/include/asm/cmpxchg-xchg.h b/arch/sh/include/asm/cmpxchg-xchg.h > index 7219719..1e881f5 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 > -- > 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/sh/include/asm/cmpxchg-xchg.h b/arch/sh/include/asm/cmpxchg-xchg.h index 7219719..1e881f5 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