Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752841AbbH1Gov (ORCPT ); Fri, 28 Aug 2015 02:44:51 -0400 Received: from terminus.zytor.com ([198.137.202.10]:54879 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751665AbbH1Got (ORCPT ); Fri, 28 Aug 2015 02:44:49 -0400 Date: Thu, 27 Aug 2015 23:43:46 -0700 From: "tip-bot for Luis R. Rodriguez" Message-ID: Cc: toshi.kani@hp.com, hpa@zytor.com, tomi.valkeinen@ti.com, peterz@infradead.org, fengguang.wu@intel.com, plagnioj@jcrosoft.com, akpm@linux-foundation.org, frank.blaschka@de.ibm.com, rostedt@goodmis.org, linux@roeck-us.net, mingo@kernel.org, mcgrof@suse.com, heiko.carstens@de.ibm.com, treding@nvidia.com, will.deacon@arm.com, schwidefsky@de.ibm.com, torvalds@linux-foundation.org, bp@suse.de, tglx@linutronix.de, linux-kernel@vger.kernel.org Reply-To: rostedt@goodmis.org, frank.blaschka@de.ibm.com, akpm@linux-foundation.org, fengguang.wu@intel.com, plagnioj@jcrosoft.com, peterz@infradead.org, tomi.valkeinen@ti.com, hpa@zytor.com, toshi.kani@hp.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, torvalds@linux-foundation.org, bp@suse.de, schwidefsky@de.ibm.com, will.deacon@arm.com, treding@nvidia.com, heiko.carstens@de.ibm.com, mcgrof@suse.com, mingo@kernel.org, linux@roeck-us.net In-Reply-To: <1440632050-23648-1-git-send-email-mcgrof@do-not-panic.com> References: <1440632050-23648-1-git-send-email-mcgrof@do-not-panic.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/mm] s390/io: Add pci_iomap_wc() and pci_iomap_wc_range() Git-Commit-ID: ee03c5868e74847ba0bd1e6dccbbe26e6504466d 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: 2906 Lines: 76 Commit-ID: ee03c5868e74847ba0bd1e6dccbbe26e6504466d Gitweb: http://git.kernel.org/tip/ee03c5868e74847ba0bd1e6dccbbe26e6504466d Author: Luis R. Rodriguez AuthorDate: Wed, 26 Aug 2015 16:34:10 -0700 Committer: Ingo Molnar CommitDate: Fri, 28 Aug 2015 08:04:48 +0200 s390/io: Add pci_iomap_wc() and pci_iomap_wc_range() The following commit: 1b3d4200c1e0 ("PCI: Add pci_iomap_wc() variants") Introduced pci_iomap_wc() variants but broke the s390 build, because s390 requires its own implementation of pcio_iomap*() calls. The reason for that is that: "BAR spaces are not disjunctive on s390 so we need the bar parameter of pci_iomap to find the corresponding device and create the mapping cookie" so it has its own lookup/lock solution and it does not include asm-generic/pci_iomap.h. Since it currenty maps ioremap_wc() to ioremap_nocache() and that's the architecture default we can easily just map the wc calls to the default calls as well. Reported-by: kbuild test robot Signed-off-by: Luis R. Rodriguez Cc: Andrew Morton Cc: Borislav Petkov Cc: Fengguang Wu Cc: Frank Blaschka Cc: Guenter Roeck Cc: Heiko Carstens Cc: Jean-Christophe Plagniol-Villard Cc: Linus Torvalds Cc: Martin Schwidefsky Cc: Peter Zijlstra Cc: Steven Rostedt Cc: Thierry Reding Cc: Thomas Gleixner Cc: Tomi Valkeinen Cc: Toshi Kani Cc: Will Deacon Cc: linux-fbdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: linux-s390@vger.kernel.org Cc: linux390@de.ibm.com Link: http://lkml.kernel.org/r/1440632050-23648-1-git-send-email-mcgrof@do-not-panic.com Signed-off-by: Ingo Molnar --- arch/s390/include/asm/io.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/s390/include/asm/io.h b/arch/s390/include/asm/io.h index cb5fdf3..437e9af 100644 --- a/arch/s390/include/asm/io.h +++ b/arch/s390/include/asm/io.h @@ -57,6 +57,8 @@ static inline void ioport_unmap(void __iomem *p) */ #define pci_iomap pci_iomap #define pci_iounmap pci_iounmap +#define pci_iomap_wc pci_iomap +#define pci_iomap_wc_range pci_iomap_range #define memcpy_fromio(dst, src, count) zpci_memcpy_fromio(dst, src, count) #define memcpy_toio(dst, src, count) zpci_memcpy_toio(dst, src, count) -- 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/