linux-alpha.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@redhat.com>
To: linux-alpha@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCHv2 RFC (repost) 14/16] mn10300: add missing __iomap markers
Date: Wed, 21 Dec 2011 18:30:22 +0200	[thread overview]
Message-ID: <1937e158e890d52d2097360d3270f270bd7e5001.1324484752.git.mst@redhat.com> (raw)
In-Reply-To: <cover.1324484752.git.mst@redhat.com>

MN10300's *ioremap*() collection lacks __iomem markers.
Fix that.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 arch/mn10300/include/asm/io.h |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/arch/mn10300/include/asm/io.h b/arch/mn10300/include/asm/io.h
index 787255d..0d6d54f 100644
--- a/arch/mn10300/include/asm/io.h
+++ b/arch/mn10300/include/asm/io.h
@@ -251,15 +251,15 @@ static inline void *phys_to_virt(unsigned long address)
 /*
  * Change "struct page" to physical address.
  */
-static inline void *__ioremap(unsigned long offset, unsigned long size,
-			      unsigned long flags)
+static inline void __iomem *__ioremap(unsigned long offset, unsigned long size,
+				      unsigned long flags)
 {
-	return (void *) offset;
+	return (void __iomem *) offset;
 }
 
-static inline void *ioremap(unsigned long offset, unsigned long size)
+static inline void __iomem *ioremap(unsigned long offset, unsigned long size)
 {
-	return (void *) offset;
+	return (void __iomem *) offset;
 }
 
 /*
@@ -267,14 +267,14 @@ static inline void *ioremap(unsigned long offset, unsigned long size)
  * area.  it's useful if some control registers are in such an area and write
  * combining or read caching is not desirable:
  */
-static inline void *ioremap_nocache(unsigned long offset, unsigned long size)
+static inline void __iomem *ioremap_nocache(unsigned long offset, unsigned long size)
 {
-	return (void *) (offset | 0x20000000);
+	return (void __iomem *) (offset | 0x20000000);
 }
 
 #define ioremap_wc ioremap_nocache
 
-static inline void iounmap(void *addr)
+static inline void iounmap(void __iomem *addr)
 {
 }
 
-- 
1.7.8.382.g3daff

  parent reply	other threads:[~2011-12-21 16:30 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-12-21 16:29 [PATCHv2 RFC (repost) 00/16] pci: use generic pci_iomap on all architectures Michael S. Tsirkin
2011-12-21 16:29 ` [PATCHv2 RFC (repost) 01/16] lib: move GENERIC_IOMAP to lib/Kconfig Michael S. Tsirkin
2011-12-21 16:29 ` [PATCHv2 RFC (repost) 02/16] lib: add GENERIC_PCI_IOMAP Michael S. Tsirkin
2011-12-21 16:29 ` [PATCHv2 RFC (repost) 03/16] alpha: switch to GENERIC_PCI_IOMAP Michael S. Tsirkin
2011-12-21 16:29 ` [PATCHv2 RFC (repost) 04/16] arm: " Michael S. Tsirkin
2011-12-21 16:29 ` [PATCHv2 RFC (repost) 05/16] microblaze: " Michael S. Tsirkin
2011-12-21 16:29 ` [PATCHv2 RFC (repost) 08/16] powerpc: " Michael S. Tsirkin
2011-12-21 16:29 ` [PATCHv2 RFC (repost) 06/16] mips: " Michael S. Tsirkin
2011-12-21 16:29 ` [PATCHv2 RFC (repost) 09/16] sh: " Michael S. Tsirkin
2011-12-21 16:29 ` [PATCHv2 RFC (repost) 10/16] sparc: " Michael S. Tsirkin
2011-12-21 20:39   ` David Miller
2011-12-22  8:26     ` Michael S. Tsirkin
2011-12-21 16:29 ` [PATCHv2 RFC (repost) 07/16] parisc: " Michael S. Tsirkin
2011-12-21 16:30 ` [PATCHv2 RFC (repost) 11/16] tile: don't panic on iomap Michael S. Tsirkin
2011-12-21 16:30 ` [PATCHv2 RFC (repost) 12/16] tile: switch to GENERIC_PCI_IOMAP Michael S. Tsirkin
2011-12-21 16:30 ` [PATCHv2 RFC (repost) 13/16] frv: " Michael S. Tsirkin
2011-12-21 16:30 ` [PATCHv2 RFC (repost) 15/16] mn10300: " Michael S. Tsirkin
2011-12-21 16:30 ` Michael S. Tsirkin [this message]
2011-12-21 16:30 ` [PATCHv2 RFC (repost) 16/16] alpha: drop pci_iomap/pci_iounmap from pci-noop.c Michael S. Tsirkin

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=1937e158e890d52d2097360d3270f270bd7e5001.1324484752.git.mst@redhat.com \
    --to=mst@redhat.com \
    --cc=linux-alpha@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).