Commit 7e9710af authored May 29, 2017 by Logan Gunthorpe Committed by Martin Schwidefsky Jun 12, 2017

s390: provide default ioremap and iounmap declaration



Move the CONFIG_PCI device so that ioremap and iounmap are always
available. This looks safe as there's nothing PCI specific in the
implementation of these functions.

I have designs to use these functions in scatterlist.c where they'd likely
never be called without CONFIG_PCI set, but this is needed to compile
such changes.

Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Sebastian Ott <sebott@linux.vnet.ibm.com>
Cc: Al Viro <viro@ZenIV.linux.org.uk>
Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

parent c39457ff

arch/s390/include/asm/io.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -25,8 +25,6 @@ void unxlate_dev_mem_ptr(phys_addr_t phys, void *addr);

		#define IO_SPACE_LIMIT 0

		#ifdef CONFIG_PCI

		#define ioremap_nocache(addr, size) ioremap(addr, size)
		#define ioremap_wc ioremap_nocache
		#define ioremap_wt ioremap_nocache
		@@ -49,6 +47,8 @@ static inline void ioport_unmap(void __iomem *p)
		{
		}

		#ifdef CONFIG_PCI

		/*
		* s390 needs a private implementation of pci_iomap since ioremap with its
		* offset parameter isn't sufficient. That's because BAR spaces are not

Admin message