On 27/01/11 23:56, Akinobu Mita wrote:
(This patch is intended to be folded into the patch in -mm:
m68knommu-introduce-little-endian-bitops.patch)
A few little-endian bitops on m68knommu 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: Greg Ungerer<gerg@xxxxxxxxxxx>
Cc: Greg Ungerer<gerg@xxxxxxxxxxxx>
You drop both of these "CC"'s and add:
Acked-by: Greg Ungerer <gerg@xxxxxxxxxxx>
Cc: Geert Uytterhoeven<geert@xxxxxxxxxxxxxx>
Cc: Roman Zippel<zippel@xxxxxxxxxxxxxx>
Cc: Andreas Schwab<schwab@xxxxxxxxxxxxxx>
---
arch/m68k/include/asm/bitops_no.h | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/arch/m68k/include/asm/bitops_no.h b/arch/m68k/include/asm/bitops_no.h
index c5f5a78..7d3779f 100644
--- a/arch/m68k/include/asm/bitops_no.h
+++ b/arch/m68k/include/asm/bitops_no.h
@@ -198,11 +198,15 @@ static __inline__ int __test_bit(int nr, const volatile unsigned long * addr)
#define BITOP_LE_SWIZZLE ((BITS_PER_LONG-1)& ~0x7)
-#define __set_bit_le(nr, addr) \
- __set_bit((nr) ^ BITOP_LE_SWIZZLE, (unsigned long *)(addr))
+static inline void __set_bit_le(int nr, void *addr)
+{
+ __set_bit(nr ^ BITOP_LE_SWIZZLE, addr);
+}
-#define __clear_bit_le(nr, addr) \
- __clear_bit((nr) ^ BITOP_LE_SWIZZLE, (unsigned long *)(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, volatile void *addr)
{
--
------------------------------------------------------------------------
Greg Ungerer -- Principal Engineer EMAIL: gerg@xxxxxxxxxxxx
SnapGear Group, McAfee PHONE: +61 7 3435 2888
8 Gardner Close FAX: +61 7 3217 5323
Milton, QLD, 4064, Australia WEB: http://www.SnapGear.com
--
To unsubscribe from this list: send the line "unsubscribe linux-arch" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
