From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753480Ab1A0Nzx (ORCPT ); Thu, 27 Jan 2011 08:55:53 -0500 Received: from mail-iy0-f174.google.com ([209.85.210.174]:47979 "EHLO mail-iy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753214Ab1A0Nzu (ORCPT ); Thu, 27 Jan 2011 08:55:50 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=ghkNWpegzxd4RqbIb/N9t+sTLYLP7iRydtwI1Fxc54kiG4VflVtPV3SsGvJQUchImz DcYAM2TGe1p4StNYCJZAPdplRqzCq/94L2qjrQFg/Kog4acdrH7J4+AZE3bLuMTHLsjL NvaoyH8UuXz4ho/OuCs61xGqPU3Qs8DOiCz60= From: Akinobu Mita To: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, akpm@linux-foundation.org Cc: Akinobu Mita , Linus Torvalds , Arnd Bergmann , Richard Henderson , Ivan Kokshaysky , Mikael Starvik , David Howells , Yoshinori Sato , "Luck, Tony" , Ralf Baechle , Kyle McMartin , Matthew Wilcox , Grant Grundler , Paul Mundt , Kazumoto Kojima , Hirokazu Takata , "David S. Miller" , Chris Zankel , Ingo Molnar , Thomas Gleixner , Hans-Christian Egtvedt , "H. Peter Anvin" , Benjamin Herrenschmidt , Paul Mackerras Subject: [PATCH -mm 1/6] asm-generic: convert little-endian bitops macros to static inline functions Date: Thu, 27 Jan 2011 22:56:18 +0900 Message-Id: <1296136583-13815-2-git-send-email-akinobu.mita@gmail.com> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1296136583-13815-1-git-send-email-akinobu.mita@gmail.com> References: <1296136583-13815-1-git-send-email-akinobu.mita@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org (This patch is intended to be folded into the patch in -mm: asm-generic-change-little-endian-bitops-to-take-any-pointer-types.patch) The little-endian bitops on asm-generic 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" Signed-off-by: Akinobu Mita Cc: Linus Torvalds Cc: Arnd Bergmann Cc: Richard Henderson Cc: Ivan Kokshaysky Cc: Mikael Starvik Cc: David Howells Cc: Yoshinori Sato Cc: "Luck, Tony" Cc: Ralf Baechle Cc: Kyle McMartin Cc: Matthew Wilcox Cc: Grant Grundler Cc: Paul Mundt Cc: Kazumoto Kojima Cc: Hirokazu Takata Cc: "David S. Miller" Cc: Chris Zankel Cc: Ingo Molnar Cc: Thomas Gleixner Cc: Hans-Christian Egtvedt Cc: "H. Peter Anvin" Cc: Benjamin Herrenschmidt Cc: Paul Mackerras --- include/asm-generic/bitops/le.h | 73 +++++++++++++++++++++++++++------------ 1 files changed, 51 insertions(+), 22 deletions(-) diff --git a/include/asm-generic/bitops/le.h b/include/asm-generic/bitops/le.h index 7644a15..946a21b 100644 --- a/include/asm-generic/bitops/le.h +++ b/include/asm-generic/bitops/le.h @@ -8,12 +8,23 @@ #define BITOP_LE_SWIZZLE 0 -#define find_next_zero_bit_le(addr, size, offset) \ - find_next_zero_bit((unsigned long *)(addr), size, offset) -#define find_next_bit_le(addr, size, offset) \ - find_next_bit((unsigned long *)(addr), size, offset) -#define find_first_zero_bit_le(addr, size) \ - find_first_zero_bit((unsigned long *)(addr), size) +static inline unsigned long find_next_zero_bit_le(const void *addr, + unsigned long size, unsigned long offset) +{ + return find_next_zero_bit(addr, size, offset); +} + +static inline unsigned long find_next_bit_le(const void *addr, + unsigned long size, unsigned long offset) +{ + return find_next_bit(addr, size, offset); +} + +static inline unsigned long find_first_zero_bit_le(const void *addr, + unsigned long size) +{ + return find_first_zero_bit(addr, size); +} #elif defined(__BIG_ENDIAN) @@ -31,21 +42,39 @@ extern unsigned long find_next_bit_le(const void *addr, #error "Please fix " #endif -#define test_bit_le(nr, addr) \ - test_bit((nr) ^ BITOP_LE_SWIZZLE, (unsigned long *)(addr)) -#define __set_bit_le(nr, addr) \ - __set_bit((nr) ^ BITOP_LE_SWIZZLE, (unsigned long *)(addr)) -#define __clear_bit_le(nr, addr) \ - __clear_bit((nr) ^ BITOP_LE_SWIZZLE, (unsigned long *)(addr)) - -#define test_and_set_bit_le(nr, addr) \ - test_and_set_bit((nr) ^ BITOP_LE_SWIZZLE, (unsigned long *)(addr)) -#define test_and_clear_bit_le(nr, addr) \ - test_and_clear_bit((nr) ^ BITOP_LE_SWIZZLE, (unsigned long *)(addr)) - -#define __test_and_set_bit_le(nr, addr) \ - __test_and_set_bit((nr) ^ BITOP_LE_SWIZZLE, (unsigned long *)(addr)) -#define __test_and_clear_bit_le(nr, addr) \ - __test_and_clear_bit((nr) ^ BITOP_LE_SWIZZLE, (unsigned long *)(addr)) +static inline int test_bit_le(int nr, const void *addr) +{ + return test_bit(nr ^ BITOP_LE_SWIZZLE, addr); +} + +static inline void __set_bit_le(int nr, void *addr) +{ + __set_bit(nr ^ BITOP_LE_SWIZZLE, addr); +} + +static inline void __clear_bit_le(int nr, void *addr) +{ + __clear_bit(nr ^ BITOP_LE_SWIZZLE, addr); +} + +static inline int test_and_set_bit_le(int nr, void *addr) +{ + return test_and_set_bit(nr ^ BITOP_LE_SWIZZLE, addr); +} + +static inline int test_and_clear_bit_le(int nr, void *addr) +{ + return test_and_clear_bit(nr ^ BITOP_LE_SWIZZLE, addr); +} + +static inline int __test_and_set_bit_le(int nr, void *addr) +{ + return __test_and_set_bit(nr ^ BITOP_LE_SWIZZLE, addr); +} + +static inline int __test_and_clear_bit_le(int nr, void *addr) +{ + return __test_and_clear_bit(nr ^ BITOP_LE_SWIZZLE, addr); +} #endif /* _ASM_GENERIC_BITOPS_LE_H_ */ -- 1.7.3.4 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Akinobu Mita Subject: [PATCH -mm 1/6] asm-generic: convert little-endian bitops macros to static inline functions Date: Thu, 27 Jan 2011 22:56:18 +0900 Message-ID: <1296136583-13815-2-git-send-email-akinobu.mita@gmail.com> References: <1296136583-13815-1-git-send-email-akinobu.mita@gmail.com> Return-path: In-Reply-To: <1296136583-13815-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 Cc: Akinobu Mita , Linus Torvalds , Arnd Bergmann , Richard Henderson , Ivan Kokshaysky , Mikael Starvik , David Howells , Yoshinori Sato , "Luck, Tony" , Ralf Baechle , Kyle McMartin , Matthew Wilcox , Grant Grundler , Paul Mundt , Kazumoto Kojima , Hirokazu Takata , "David S. Miller" , Chris Zankel , Ingo Molnar , Thomas Gleixner , Hans-Christian Egtvedt , "H. Peter Anvin" Benjamin Herrenschmidt List-Id: linux-arch.vger.kernel.org (This patch is intended to be folded into the patch in -mm: asm-generic-change-little-endian-bitops-to-take-any-pointer-types.patch) The little-endian bitops on asm-generic 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" Signed-off-by: Akinobu Mita Cc: Linus Torvalds Cc: Arnd Bergmann Cc: Richard Henderson Cc: Ivan Kokshaysky Cc: Mikael Starvik Cc: David Howells Cc: Yoshinori Sato Cc: "Luck, Tony" Cc: Ralf Baechle Cc: Kyle McMartin Cc: Matthew Wilcox Cc: Grant Grundler Cc: Paul Mundt Cc: Kazumoto Kojima Cc: Hirokazu Takata Cc: "David S. Miller" Cc: Chris Zankel Cc: Ingo Molnar Cc: Thomas Gleixner Cc: Hans-Christian Egtvedt Cc: "H. Peter Anvin" Cc: Benjamin Herrenschmidt Cc: Paul Mackerras --- include/asm-generic/bitops/le.h | 73 +++++++++++++++++++++++++++------------ 1 files changed, 51 insertions(+), 22 deletions(-) diff --git a/include/asm-generic/bitops/le.h b/include/asm-generic/bitops/le.h index 7644a15..946a21b 100644 --- a/include/asm-generic/bitops/le.h +++ b/include/asm-generic/bitops/le.h @@ -8,12 +8,23 @@ #define BITOP_LE_SWIZZLE 0 -#define find_next_zero_bit_le(addr, size, offset) \ - find_next_zero_bit((unsigned long *)(addr), size, offset) -#define find_next_bit_le(addr, size, offset) \ - find_next_bit((unsigned long *)(addr), size, offset) -#define find_first_zero_bit_le(addr, size) \ - find_first_zero_bit((unsigned long *)(addr), size) +static inline unsigned long find_next_zero_bit_le(const void *addr, + unsigned long size, unsigned long offset) +{ + return find_next_zero_bit(addr, size, offset); +} + +static inline unsigned long find_next_bit_le(const void *addr, + unsigned long size, unsigned long offset) +{ + return find_next_bit(addr, size, offset); +} + +static inline unsigned long find_first_zero_bit_le(const void *addr, + unsigned long size) +{ + return find_first_zero_bit(addr, size); +} #elif defined(__BIG_ENDIAN) @@ -31,21 +42,39 @@ extern unsigned long find_next_bit_le(const void *addr, #error "Please fix " #endif -#define test_bit_le(nr, addr) \ - test_bit((nr) ^ BITOP_LE_SWIZZLE, (unsigned long *)(addr)) -#define __set_bit_le(nr, addr) \ - __set_bit((nr) ^ BITOP_LE_SWIZZLE, (unsigned long *)(addr)) -#define __clear_bit_le(nr, addr) \ - __clear_bit((nr) ^ BITOP_LE_SWIZZLE, (unsigned long *)(addr)) - -#define test_and_set_bit_le(nr, addr) \ - test_and_set_bit((nr) ^ BITOP_LE_SWIZZLE, (unsigned long *)(addr)) -#define test_and_clear_bit_le(nr, addr) \ - test_and_clear_bit((nr) ^ BITOP_LE_SWIZZLE, (unsigned long *)(addr)) - -#define __test_and_set_bit_le(nr, addr) \ - __test_and_set_bit((nr) ^ BITOP_LE_SWIZZLE, (unsigned long *)(addr)) -#define __test_and_clear_bit_le(nr, addr) \ - __test_and_clear_bit((nr) ^ BITOP_LE_SWIZZLE, (unsigned long *)(addr)) +static inline int test_bit_le(int nr, const void *addr) +{ + return test_bit(nr ^ BITOP_LE_SWIZZLE, addr); +} + +static inline void __set_bit_le(int nr, void *addr) +{ + __set_bit(nr ^ BITOP_LE_SWIZZLE, addr); +} + +static inline void __clear_bit_le(int nr, void *addr) +{ + __clear_bit(nr ^ BITOP_LE_SWIZZLE, addr); +} + +static inline int test_and_set_bit_le(int nr, void *addr) +{ + return test_and_set_bit(nr ^ BITOP_LE_SWIZZLE, addr); +} + +static inline int test_and_clear_bit_le(int nr, void *addr) +{ + return test_and_clear_bit(nr ^ BITOP_LE_SWIZZLE, addr); +} + +static inline int __test_and_set_bit_le(int nr, void *addr) +{ + return __test_and_set_bit(nr ^ BITOP_LE_SWIZZLE, addr); +} + +static inline int __test_and_clear_bit_le(int nr, void *addr) +{ + return __test_and_clear_bit(nr ^ BITOP_LE_SWIZZLE, addr); +} #endif /* _ASM_GENERIC_BITOPS_LE_H_ */ -- 1.7.3.4