The patch titled s390: use asm-generic/bitops/le.h has been removed from the -mm tree. Its filename was s390-use-asm-generic-bitops-leh.patch This patch was dropped because an updated version will be merged The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: s390: use asm-generic/bitops/le.h From: Akinobu Mita <akinobu.mita@xxxxxxxxx> The previous style change enables to use asm-generic/bitops/le.h on s390. Signed-off-by: Akinobu Mita <akinobu.mita@xxxxxxxxx> Cc: Arnd Bergmann <arnd@xxxxxxxx> Cc: Russell King <linux@xxxxxxxxxxxxxxxx> Cc: Martin Schwidefsky <schwidefsky@xxxxxxxxxx> Cc: Heiko Carstens <heiko.carstens@xxxxxxxxxx> Cc: Greg Ungerer <gerg@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/s390/include/asm/bitops.h | 37 +------------------------------ 1 file changed, 2 insertions(+), 35 deletions(-) diff -puN arch/s390/include/asm/bitops.h~s390-use-asm-generic-bitops-leh arch/s390/include/asm/bitops.h --- a/arch/s390/include/asm/bitops.h~s390-use-asm-generic-bitops-leh +++ a/arch/s390/include/asm/bitops.h @@ -746,41 +746,6 @@ static inline int sched_find_first_bit(u * 23 22 21 20 19 18 17 16 31 30 29 28 27 26 25 24 */ -static inline void __set_bit_le(unsigned long nr, void *addr) -{ - __set_bit(nr ^ (__BITOPS_WORDSIZE - 8), addr); -} - -static inline void __clear_bit_le(unsigned long nr, void *addr) -{ - __clear_bit(nr ^ (__BITOPS_WORDSIZE - 8), addr); -} - -static inline int __test_and_set_bit_le(unsigned long nr, void *addr) -{ - return __test_and_set_bit(nr ^ (__BITOPS_WORDSIZE - 8), addr); -} - -static inline int test_and_set_bit_le(unsigned long nr, void *addr) -{ - return test_and_set_bit(nr ^ (__BITOPS_WORDSIZE - 8), addr); -} - -static inline int __test_and_clear_bit_le(unsigned long nr, void *addr) -{ - return __test_and_clear_bit(nr ^ (__BITOPS_WORDSIZE - 8), addr); -} - -static inline int test_and_clear_bit_le(unsigned long nr, void *addr) -{ - return test_and_clear_bit(nr ^ (__BITOPS_WORDSIZE - 8), addr); -} - -static inline int test_bit_le(unsigned long nr, const void *addr) -{ - return test_bit(nr ^ (__BITOPS_WORDSIZE - 8), addr); -} - static inline int find_first_zero_bit_le(void *vaddr, unsigned int size) { unsigned long bytes, bits; @@ -865,6 +830,8 @@ static inline int find_next_bit_le(void } #define find_next_bit_le find_next_bit_le +#include <asm-generic/bitops/le.h> + #define ext2_set_bit_atomic(lock, nr, addr) \ test_and_set_bit_le(nr, addr) #define ext2_clear_bit_atomic(lock, nr, addr) \ _ Patches currently in -mm which might be from akinobu.mita@xxxxxxxxx are linux-next.patch m68knommu-fix-build-error-due-to-the-lack-of-find_next_bit_le.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html