git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw
[pandora-kernel.git]
/
arch
/
mn10300
/
include
/
asm
/
bitops.h
diff --git
a/arch/mn10300/include/asm/bitops.h
b/arch/mn10300/include/asm/bitops.h
index
f49ac49
..
3f50e96
100644
(file)
--- 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) \
#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) \
#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>
#include <asm-generic/bitops/ext2-non-atomic.h>
#include <asm-generic/bitops/minix-le.h>