diff options
author | Logan Gunthorpe <logang@deltatee.com> | 2017-05-29 15:13:08 -0400 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2017-06-12 10:26:00 -0400 |
commit | 7e9710af2301e76421a6a8f2655937651279f5c4 (patch) | |
tree | 863f077b0529bea8d479b9d8dcbb3fb1d9c8cc7d | |
parent | c39457ff1fd58bf5cc466025b1467de29ba0437a (diff) |
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>
-rw-r--r-- | arch/s390/include/asm/io.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/include/asm/io.h b/arch/s390/include/asm/io.h index 437e9af96688..904e4b3af95d 100644 --- a/arch/s390/include/asm/io.h +++ b/arch/s390/include/asm/io.h | |||
@@ -25,8 +25,6 @@ void unxlate_dev_mem_ptr(phys_addr_t phys, void *addr); | |||
25 | 25 | ||
26 | #define IO_SPACE_LIMIT 0 | 26 | #define IO_SPACE_LIMIT 0 |
27 | 27 | ||
28 | #ifdef CONFIG_PCI | ||
29 | |||
30 | #define ioremap_nocache(addr, size) ioremap(addr, size) | 28 | #define ioremap_nocache(addr, size) ioremap(addr, size) |
31 | #define ioremap_wc ioremap_nocache | 29 | #define ioremap_wc ioremap_nocache |
32 | #define ioremap_wt ioremap_nocache | 30 | #define ioremap_wt ioremap_nocache |
@@ -49,6 +47,8 @@ static inline void ioport_unmap(void __iomem *p) | |||
49 | { | 47 | { |
50 | } | 48 | } |
51 | 49 | ||
50 | #ifdef CONFIG_PCI | ||
51 | |||
52 | /* | 52 | /* |
53 | * s390 needs a private implementation of pci_iomap since ioremap with its | 53 | * s390 needs a private implementation of pci_iomap since ioremap with its |
54 | * offset parameter isn't sufficient. That's because BAR spaces are not | 54 | * offset parameter isn't sufficient. That's because BAR spaces are not |