aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMark Salter <msalter@redhat.com>2010-09-23 16:40:22 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2010-09-23 09:12:21 -0700
commitfd429a0842c61b60e02a7e63430a609957821c67 (patch)
tree41c0ee0cbb3b2c388723bf17edf1df66cb949e8c /arch
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu (diff)
downloadlinux-dev-fd429a0842c61b60e02a7e63430a609957821c67.tar.xz
linux-dev-fd429a0842c61b60e02a7e63430a609957821c67.zip
MN10300: Fix endianess of ext2 bitops
The MN10300 arch ext2 bitops assume a big-endian kernel, but the MN10300 arch only runs in little-endian mode. Reported-by: Akira Takeuchi <takeuchi.akr@jp.panasonic.com> Signed-off-by: Mark Salter <msalter@redhat.com> Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/mn10300/include/asm/bitops.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mn10300/include/asm/bitops.h b/arch/mn10300/include/asm/bitops.h
index f49ac49e09ad..3f50e9661076 100644
--- a/arch/mn10300/include/asm/bitops.h
+++ b/arch/mn10300/include/asm/bitops.h
@@ -229,9 +229,9 @@ int ffs(int x)
#include <asm-generic/bitops/hweight.h>
#define ext2_set_bit_atomic(lock, nr, addr) \
- test_and_set_bit((nr) ^ 0x18, (addr))
+ test_and_set_bit((nr), (addr))
#define ext2_clear_bit_atomic(lock, nr, addr) \
- test_and_clear_bit((nr) ^ 0x18, (addr))
+ test_and_clear_bit((nr), (addr))
#include <asm-generic/bitops/ext2-non-atomic.h>
#include <asm-generic/bitops/minix-le.h>