LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Akinobu Mita <akinobu.mita@gmail.com>
To: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org,
akpm@linux-foundation.org
Cc: Akinobu Mita <akinobu.mita@gmail.com>,
Greg Ungerer <gerg@uclinux.org>, Greg Ungerer <gerg@snapgear.com>,
Geert Uytterhoeven <geert@linux-m68k.org>,
Roman Zippel <zippel@linux-m68k.org>,
Andreas Schwab <schwab@linux-m68k.org>
Subject: [PATCH -mm 6/6] m68knommu: convert little-endian bitops macros to static inline functions
Date: Thu, 27 Jan 2011 22:56:23 +0900 [thread overview]
Message-ID: <1296136583-13815-7-git-send-email-akinobu.mita@gmail.com> (raw)
In-Reply-To: <1296136583-13815-1-git-send-email-akinobu.mita@gmail.com>
(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@zytor.com>
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Cc: Greg Ungerer <gerg@uclinux.org>
Cc: Greg Ungerer <gerg@snapgear.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Roman Zippel <zippel@linux-m68k.org>
Cc: Andreas Schwab <schwab@linux-m68k.org>
---
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)
{
--
1.7.3.4
next prev parent reply other threads:[~2011-01-27 13:56 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-27 13:56 [PATCH -mm 0/6] convert little-endian bitops macros to " Akinobu Mita
2011-01-27 13:56 ` [PATCH -mm 1/6] asm-generic: convert little-endian bitops macros to static " Akinobu Mita
2011-01-27 13:56 ` [PATCH -mm 2/6] powerpc: " Akinobu Mita
2011-02-06 23:14 ` Benjamin Herrenschmidt
2011-02-07 3:08 ` Akinobu Mita
2011-01-27 13:56 ` [PATCH -mm 3/6] s390: " Akinobu Mita
2011-01-27 13:56 ` [PATCH -mm 4/6] arm: " Akinobu Mita
2011-01-27 13:56 ` [PATCH -mm 5/6] m68k: " Akinobu Mita
2011-01-27 13:56 ` Akinobu Mita [this message]
2011-01-28 0:36 ` [PATCH -mm 6/6] m68knommu: " Greg Ungerer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1296136583-13815-7-git-send-email-akinobu.mita@gmail.com \
--to=akinobu.mita@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=geert@linux-m68k.org \
--cc=gerg@snapgear.com \
--cc=gerg@uclinux.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=schwab@linux-m68k.org \
--cc=zippel@linux-m68k.org \
--subject='Re: [PATCH -mm 6/6] m68knommu: convert little-endian bitops macros to static inline functions' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).