From 6e2208c2a23583d277dd2870a38375921cbaee35 Mon Sep 17 00:00:00 2001 From: Akinobu Mita Date: Thu, 26 May 2011 16:26:12 -0700 Subject: [PATCH] --- yaml --- r: 252077 b: refs/heads/master c: 802caabbededeecbe433bcdb8a8ee0721836f7db h: refs/heads/master i: 252075: 6abfdaf3c40e66753e25e493d187a2aa50e55398 v: v3 --- [refs] | 2 +- trunk/arch/s390/include/asm/bitops.h | 37 ++-------------------------- 2 files changed, 3 insertions(+), 36 deletions(-) diff --git a/[refs] b/[refs] index 40f70f72dbc0..618f21474711 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 04b18ff9ca69545a2447462a65c7ba5373e23f69 +refs/heads/master: 802caabbededeecbe433bcdb8a8ee0721836f7db diff --git a/trunk/arch/s390/include/asm/bitops.h b/trunk/arch/s390/include/asm/bitops.h index 426c97459f68..667c6e9f6a34 100644 --- a/trunk/arch/s390/include/asm/bitops.h +++ b/trunk/arch/s390/include/asm/bitops.h @@ -746,41 +746,6 @@ static inline int sched_find_first_bit(unsigned long *b) * 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 *vaddr, unsigned long size, } #define find_next_bit_le find_next_bit_le +#include + #define ext2_set_bit_atomic(lock, nr, addr) \ test_and_set_bit_le(nr, addr) #define ext2_clear_bit_atomic(lock, nr, addr) \