projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
[powerpc.git]
/
include
/
asm-s390
/
bitops.h
diff --git
a/include/asm-s390/bitops.h
b/include/asm-s390/bitops.h
index
8651524
..
6123276
100644
(file)
--- a/
include/asm-s390/bitops.h
+++ b/
include/asm-s390/bitops.h
@@
-518,8
+518,8
@@
static inline int __test_bit(unsigned long nr, const volatile unsigned long *ptr
static inline int
__constant_test_bit(unsigned long nr, const volatile unsigned long *addr) {
static inline int
__constant_test_bit(unsigned long nr, const volatile unsigned long *addr) {
- return (((volatile char *) addr)
- [(nr^(__BITOPS_WORDSIZE-8))>>3] & (1<<(nr&7)));
+ return (((
(
volatile char *) addr)
+ [(nr^(__BITOPS_WORDSIZE-8))>>3] & (1<<(nr&7)))
) != 0
;
}
#define test_bit(nr,addr) \
}
#define test_bit(nr,addr) \
@@
-839,6
+839,7
@@
static inline int sched_find_first_bit(unsigned long *b)
* fls: find last bit set.
*/
#define fls(x) generic_fls(x)
* fls: find last bit set.
*/
#define fls(x) generic_fls(x)
+#define fls64(x) generic_fls64(x)
/*
* hweightN: returns the hamming weight (i.e. the number
/*
* hweightN: returns the hamming weight (i.e. the number