Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754034AbbG2ITN (ORCPT ); Wed, 29 Jul 2015 04:19:13 -0400 Received: from terminus.zytor.com ([198.137.202.10]:57123 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753384AbbG2ISX (ORCPT ); Wed, 29 Jul 2015 04:18:23 -0400 Date: Wed, 29 Jul 2015 01:15:56 -0700 From: "tip-bot for Luis R. Rodriguez" Message-ID: Cc: mpe@ellerman.id.au, paulus@samba.org, linux@roeck-us.net, peter@hurleysoftware.com, a.kesavan@samsung.com, egtvedt@samfundet.no, sfr@canb.auug.org.au, hpa@zytor.com, geert@linux-m68k.org, robh@kernel.org, hskinnemoen@gmail.com, toshi.kani@hp.com, gerg@uclinux.org, gregkh@linuxfoundation.org, yasutake.koichi@jp.panasonic.com, kyle@redhat.com, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, dhowells@redhat.com, peterz@infradead.org, cmetcalf@ezchip.com, bp@suse.de, mingo@kernel.org, will.deacon@arm.com, fengguang.wu@intel.com, mcgrof@suse.com, benh@kernel.crashing.org, tglx@linutronix.de Reply-To: gerg@uclinux.org, yasutake.koichi@jp.panasonic.com, gregkh@linuxfoundation.org, a.kesavan@samsung.com, egtvedt@samfundet.no, sfr@canb.auug.org.au, hpa@zytor.com, paulus@samba.org, mpe@ellerman.id.au, peter@hurleysoftware.com, linux@roeck-us.net, robh@kernel.org, geert@linux-m68k.org, hskinnemoen@gmail.com, toshi.kani@hp.com, mingo@kernel.org, benh@kernel.crashing.org, mcgrof@suse.com, tglx@linutronix.de, will.deacon@arm.com, fengguang.wu@intel.com, torvalds@linux-foundation.org, kyle@redhat.com, peterz@infradead.org, cmetcalf@ezchip.com, bp@suse.de, dhowells@redhat.com, linux-kernel@vger.kernel.org In-Reply-To: <20150728181713.GB30479@wotan.suse.de> References: <20150728181713.GB30479@wotan.suse.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/mm] arch/*/io.h: Add ioremap_uc() to all architectures Git-Commit-ID: 4c73e8926623ca0f64c2c6111289ab8096fa647a X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 6903 Lines: 172 Commit-ID: 4c73e8926623ca0f64c2c6111289ab8096fa647a Gitweb: http://git.kernel.org/tip/4c73e8926623ca0f64c2c6111289ab8096fa647a Author: Luis R. Rodriguez AuthorDate: Tue, 28 Jul 2015 20:17:13 +0200 Committer: Ingo Molnar CommitDate: Wed, 29 Jul 2015 10:02:36 +0200 arch/*/io.h: Add ioremap_uc() to all architectures This adds ioremap_uc() only for architectures that do not include asm-generic.h/io.h as that already provides a default definition for them for both cases where you have CONFIG_MMU and you do not, and because of this, the number of architectures this patch address is less than the architectures that the ioremap_wt() patch addressed, "arch/*/io.h: Add ioremap_wt() to all architectures"). In order to reduce the number of architectures we have to modify by adding new architecture IO APIs we'll have to review the architectures in this patch, see why they can't add asm-generic.h/io.h or issues that would be created by doing so and then spread a consistent inclusion of this header towards the end of their own header. For instance arch/metag includes the asm-generic/io.h *before* the ioremap*() definitions, this should be the other way around but only once we have guard wrappers for the non-MMU case also for asm-generic/io.h. Reported-by: Stephen Rothwell Signed-off-by: Luis R. Rodriguez Cc: Abhilash Kesavan Cc: Benjamin Herrenschmidt Cc: Borislav Petkov Cc: Chris Metcalf Cc: David Howells Cc: Fengguang Wu Cc: Geert Uytterhoeven Cc: Greg Kroah-Hartman Cc: Greg Ungerer Cc: Guenter Roeck Cc: Haavard Skinnemoen Cc: Hans-Christian Egtvedt Cc: Koichi Yasutake Cc: Kyle McMartin Cc: Linus Torvalds Cc: Michael Ellerman Cc: Paul Mackerras Cc: Peter Hurley Cc: Peter Zijlstra Cc: Rob Herring Cc: Thomas Gleixner Cc: Toshi Kani Cc: Will Deacon Cc: linux-am33-list@redhat.com Cc: linux-arch@vger.kernel.org Cc: linux-m68k@lists.linux-m68k.org Cc: linux-sh@vger.kernel.org Cc: linuxppc-dev@lists.ozlabs.org Link: http://lkml.kernel.org/r/20150728181713.GB30479@wotan.suse.de Signed-off-by: Ingo Molnar --- arch/avr32/include/asm/io.h | 1 + arch/frv/include/asm/io.h | 1 + arch/m32r/include/asm/io.h | 1 + arch/m68k/include/asm/io_mm.h | 1 + arch/mn10300/include/asm/io.h | 1 + arch/powerpc/include/asm/io.h | 1 + arch/sh/include/asm/io.h | 1 + arch/tile/include/asm/io.h | 1 + 8 files changed, 8 insertions(+) diff --git a/arch/avr32/include/asm/io.h b/arch/avr32/include/asm/io.h index e998ff5..f855646 100644 --- a/arch/avr32/include/asm/io.h +++ b/arch/avr32/include/asm/io.h @@ -297,6 +297,7 @@ extern void __iounmap(void __iomem *addr); #define ioremap_wc ioremap_nocache #define ioremap_wt ioremap_nocache +#define ioremap_uc ioremap_nocache #define cached(addr) P1SEGADDR(addr) #define uncached(addr) P2SEGADDR(addr) diff --git a/arch/frv/include/asm/io.h b/arch/frv/include/asm/io.h index a31b63e..70dfbea 100644 --- a/arch/frv/include/asm/io.h +++ b/arch/frv/include/asm/io.h @@ -278,6 +278,7 @@ static inline void __iomem *ioremap_fullcache(unsigned long physaddr, unsigned l } #define ioremap_wc ioremap_nocache +#define ioremap_uc ioremap_nocache extern void iounmap(void volatile __iomem *addr); diff --git a/arch/m32r/include/asm/io.h b/arch/m32r/include/asm/io.h index 0c3f25e..4c4982a 100644 --- a/arch/m32r/include/asm/io.h +++ b/arch/m32r/include/asm/io.h @@ -69,6 +69,7 @@ extern void iounmap(volatile void __iomem *addr); #define ioremap_nocache(off,size) ioremap(off,size) #define ioremap_wc ioremap_nocache #define ioremap_wt ioremap_nocache +#define ioremap_uc ioremap_nocache /* * IO bus memory addresses are also 1:1 with the physical address diff --git a/arch/m68k/include/asm/io_mm.h b/arch/m68k/include/asm/io_mm.h index 618c85d3..a0fce34 100644 --- a/arch/m68k/include/asm/io_mm.h +++ b/arch/m68k/include/asm/io_mm.h @@ -467,6 +467,7 @@ static inline void __iomem *ioremap_nocache(unsigned long physaddr, unsigned lon { return __ioremap(physaddr, size, IOMAP_NOCACHE_SER); } +#define ioremap_uc ioremap_nocache static inline void __iomem *ioremap_wt(unsigned long physaddr, unsigned long size) { diff --git a/arch/mn10300/include/asm/io.h b/arch/mn10300/include/asm/io.h index 07c5b4a..6218935 100644 --- a/arch/mn10300/include/asm/io.h +++ b/arch/mn10300/include/asm/io.h @@ -283,6 +283,7 @@ static inline void __iomem *ioremap_nocache(unsigned long offset, unsigned long #define ioremap_wc ioremap_nocache #define ioremap_wt ioremap_nocache +#define ioremap_uc ioremap_nocache static inline void iounmap(void __iomem *addr) { diff --git a/arch/powerpc/include/asm/io.h b/arch/powerpc/include/asm/io.h index a8d2ef3..5879fde 100644 --- a/arch/powerpc/include/asm/io.h +++ b/arch/powerpc/include/asm/io.h @@ -721,6 +721,7 @@ extern void __iomem *ioremap_prot(phys_addr_t address, unsigned long size, unsigned long flags); extern void __iomem *ioremap_wc(phys_addr_t address, unsigned long size); #define ioremap_nocache(addr, size) ioremap((addr), (size)) +#define ioremap_uc(addr, size) ioremap((addr), (size)) extern void iounmap(volatile void __iomem *addr); diff --git a/arch/sh/include/asm/io.h b/arch/sh/include/asm/io.h index 728c4c5..93ec906 100644 --- a/arch/sh/include/asm/io.h +++ b/arch/sh/include/asm/io.h @@ -368,6 +368,7 @@ static inline int iounmap_fixed(void __iomem *addr) { return -EINVAL; } #endif #define ioremap_nocache ioremap +#define ioremap_uc ioremap #define iounmap __iounmap /* diff --git a/arch/tile/include/asm/io.h b/arch/tile/include/asm/io.h index dc61de1..322b5fe 100644 --- a/arch/tile/include/asm/io.h +++ b/arch/tile/include/asm/io.h @@ -55,6 +55,7 @@ extern void iounmap(volatile void __iomem *addr); #define ioremap_nocache(physaddr, size) ioremap(physaddr, size) #define ioremap_wc(physaddr, size) ioremap(physaddr, size) #define ioremap_wt(physaddr, size) ioremap(physaddr, size) +#define ioremap_uc(physaddr, size) ioremap(physaddr, size) #define ioremap_fullcache(physaddr, size) ioremap(physaddr, size) #define mmiowb() -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/