The patch titled s390-introduce-little-endian-bitops-convert-little-endian-bitops-macros-to-static-inline-functions has been removed from the -mm tree. Its filename was s390-introduce-little-endian-bitops-convert-little-endian-bitops-macros-to-static-inline-functions.patch This patch was dropped because it was folded into s390-introduce-little-endian-bitops.patch The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: s390-introduce-little-endian-bitops-convert-little-endian-bitops-macros-to-static-inline-functions From: Akinobu Mita <akinobu.mita@xxxxxxxxx> (This patch is intended to be folded into the patch in -mm: s390-introduce-little-endian-bitops.patch) The little-endian bitops on s390 are written as preprocessor macros with the cast to "unsigned long *". This means that even non-pointers will be accepted without an error, and that is a Very Bad Thing. This converts the little-endian bitops macros to static inline functions with proper prototypes. Suggested-by: "H. Peter Anvin" <hpa@xxxxxxxxx> Signed-off-by: Akinobu Mita <akinobu.mita@xxxxxxxxx> Cc: Arnd Bergmann <arnd@xxxxxxxx> Cc: Martin Schwidefsky <schwidefsky@xxxxxxxxxx> Cc: Heiko Carstens <heiko.carstens@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/s390/include/asm/bitops.h | 48 +++++++++++++++++++++---------- 1 file changed, 34 insertions(+), 14 deletions(-) diff -puN arch/s390/include/asm/bitops.h~s390-introduce-little-endian-bitops-convert-little-endian-bitops-macros-to-static-inline-functions arch/s390/include/asm/bitops.h --- a/arch/s390/include/asm/bitops.h~s390-introduce-little-endian-bitops-convert-little-endian-bitops-macros-to-static-inline-functions +++ a/arch/s390/include/asm/bitops.h @@ -742,20 +742,40 @@ static inline int sched_find_first_bit(u * 23 22 21 20 19 18 17 16 31 30 29 28 27 26 25 24 */ -#define __set_bit_le(nr, addr) \ - __set_bit((nr)^(__BITOPS_WORDSIZE - 8), (unsigned long *)(addr)) -#define __clear_bit_le(nr, addr) \ - __clear_bit((nr)^(__BITOPS_WORDSIZE - 8), (unsigned long *)(addr)) -#define __test_and_set_bit_le(nr, addr) \ - __test_and_set_bit((nr)^(__BITOPS_WORDSIZE - 8), (unsigned long *)(addr)) -#define test_and_set_bit_le(nr, addr) \ - test_and_set_bit((nr)^(__BITOPS_WORDSIZE - 8), (unsigned long *)(addr)) -#define __test_and_clear_bit_le(nr, addr) \ - __test_and_clear_bit((nr)^(__BITOPS_WORDSIZE - 8), (unsigned long *)(addr)) -#define test_and_clear_bit_le(nr, addr) \ - test_and_clear_bit((nr)^(__BITOPS_WORDSIZE - 8), (unsigned long *)(addr)) -#define test_bit_le(nr, addr) \ - test_bit((nr)^(__BITOPS_WORDSIZE - 8), (unsigned long *)(addr)) +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) { _ Patches currently in -mm which might be from akinobu.mita@xxxxxxxxx are origin.patch kvm-stop-including-asm-generic-bitops-leh-directly.patch rds-stop-including-asm-generic-bitops-leh-directly.patch bitops-merge-little-and-big-endian-definisions-in-asm-generic-bitops-leh.patch asm-generic-rename-generic-little-endian-bitops-functions.patch asm-generic-change-little-endian-bitops-to-take-any-pointer-types.patch powerpc-introduce-little-endian-bitops.patch s390-introduce-little-endian-bitops.patch arm-introduce-little-endian-bitops.patch arm-introduce-little-endian-bitops-convert-little-endian-bitops-macros-to-static-inline-functions.patch m68k-introduce-little-endian-bitops.patch m68k-introduce-little-endian-bitops-convert-little-endian-bitops-macros-to-static-inline-functions.patch bitops-introduce-config_generic_find_bit_le.patch m68knommu-introduce-little-endian-bitops.patch m68knommu-introduce-little-endian-bitops-convert-little-endian-bitops-macros-to-static-inline-functions.patch bitops-introduce-little-endian-bitops-for-most-architectures.patch asm-generic-use-little-endian-bitops.patch kvm-use-little-endian-bitops.patch rds-use-little-endian-bitops.patch ext3-use-little-endian-bitops.patch ext4-use-little-endian-bitops.patch ocfs2-use-little-endian-bitops.patch nilfs2-use-little-endian-bitops.patch reiserfs-use-little-endian-bitops.patch udf-use-little-endian-bitops.patch ufs-use-little-endian-bitops.patch md-use-little-endian-bitops.patch dm-use-little-endian-bitops.patch bitops-remove-ext2-non-atomic-bitops-from-asm-bitopsh.patch m68k-remove-inline-asm-from-minix_find_first_zero_bit.patch bitops-remove-minix-bitops-from-asm-bitopsh.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