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 branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux...
[pandora-kernel.git]
/
arch
/
alpha
/
include
/
asm
/
bitops.h
diff --git
a/arch/alpha/include/asm/bitops.h
b/arch/alpha/include/asm/bitops.h
index
85b8152
..
a19ba5e
100644
(file)
--- a/
arch/alpha/include/asm/bitops.h
+++ b/
arch/alpha/include/asm/bitops.h
@@
-456,8
+456,7
@@
sched_find_first_bit(const unsigned long b[2])
#include <asm-generic/bitops/le.h>
#include <asm-generic/bitops/le.h>
-#define ext2_set_bit_atomic(l,n,a) test_and_set_bit(n,a)
-#define ext2_clear_bit_atomic(l,n,a) test_and_clear_bit(n,a)
+#include <asm-generic/bitops/ext2-atomic-setbit.h>
#endif /* __KERNEL__ */
#endif /* __KERNEL__ */