From mboxrd@z Thu Jan 1 00:00:00 1970 From: Akinobu Mita Subject: [PATCH v2 5/6] s390: use asm-generic/bitops/le.h Date: Tue, 26 Apr 2011 22:23:42 +0900 Message-ID: <1303824223-3566-6-git-send-email-akinobu.mita@gmail.com> References: <1303824223-3566-1-git-send-email-akinobu.mita@gmail.com> Return-path: In-Reply-To: <1303824223-3566-1-git-send-email-akinobu.mita@gmail.com> Sender: linux-kernel-owner@vger.kernel.org To: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, akpm@linux-foundation.org, arnd@arndb.de Cc: Akinobu Mita , Martin Schwidefsky , Heiko Carstens , linux390@de.ibm.com, linux-s390@vger.kernel.org List-Id: linux-arch.vger.kernel.org The previous style change enables to use asm-generic/bitops/le.h on s390. Signed-off-by: Akinobu Mita Cc: Martin Schwidefsky Cc: Heiko Carstens Cc: linux390@de.ibm.com Cc: linux-s390@vger.kernel.org --- Changes from previous submission: - Rebase to mainline arch/s390/include/asm/bitops.h | 37 ++----------------------------------- 1 files changed, 2 insertions(+), 35 deletions(-) diff --git a/arch/s390/include/asm/bitops.h b/arch/s390/include/asm/bitops.h index 426c974..667c6e9 100644 --- a/arch/s390/include/asm/bitops.h +++ b/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) \ -- 1.7.4.4 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pw0-f46.google.com ([209.85.160.46]:53121 "EHLO mail-pw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755476Ab1DZNYE (ORCPT ); Tue, 26 Apr 2011 09:24:04 -0400 From: Akinobu Mita Subject: [PATCH v2 5/6] s390: use asm-generic/bitops/le.h Date: Tue, 26 Apr 2011 22:23:42 +0900 Message-ID: <1303824223-3566-6-git-send-email-akinobu.mita@gmail.com> In-Reply-To: <1303824223-3566-1-git-send-email-akinobu.mita@gmail.com> References: <1303824223-3566-1-git-send-email-akinobu.mita@gmail.com> Sender: linux-arch-owner@vger.kernel.org List-ID: To: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, akpm@linux-foundation.org, arnd@arndb.de Cc: Akinobu Mita , Martin Schwidefsky , Heiko Carstens , linux390@de.ibm.com, linux-s390@vger.kernel.org Message-ID: <20110426132342.NRjoKCkJ1Ozehjg9iwSBdzQ-hrLsr-hvOgpdbJhlJnE@z> The previous style change enables to use asm-generic/bitops/le.h on s390. Signed-off-by: Akinobu Mita Cc: Martin Schwidefsky Cc: Heiko Carstens Cc: linux390@de.ibm.com Cc: linux-s390@vger.kernel.org --- Changes from previous submission: - Rebase to mainline arch/s390/include/asm/bitops.h | 37 ++----------------------------------- 1 files changed, 2 insertions(+), 35 deletions(-) diff --git a/arch/s390/include/asm/bitops.h b/arch/s390/include/asm/bitops.h index 426c974..667c6e9 100644 --- a/arch/s390/include/asm/bitops.h +++ b/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) \ -- 1.7.4.4