lib: add GENERIC_PCI_IOMAP

Changes from v1:
	minor tweaks to address comments by Stephen Rothwell

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h
index 44053855728128590b7a160588c0352b5e0374fb..448303bdb85fd8009fdb6a6367fa9f2ed69b80ba 100644 (file)
--- a/include/asm-generic/io.h
+++ b/include/asm-generic/io.h
@@ -285,6 +285,7 @@ static inline void writesb(const void __iomem *addr, const void *buf, int len)
 #define __io_virt(x) ((void __force *) (x))
 
 #ifndef CONFIG_GENERIC_IOMAP
+struct pci_dev;
 static inline void pci_iounmap(struct pci_dev *dev, void __iomem *p)
 {
 }

diff --git a/include/asm-generic/iomap.h b/include/asm-generic/iomap.h
index fdcddcb55b5877b8ac14e1d2818ab855c9202e56..8a3d4fde26040600f7ddb9d7c3e67a4807b265ff 100644 (file)
--- a/include/asm-generic/iomap.h
+++ b/include/asm-generic/iomap.h
@@ -67,7 +67,7 @@ extern void ioport_unmap(void __iomem *);
 #endif
 
 #ifdef CONFIG_PCI
-/* Create a virtual mapping cookie for a PCI BAR (memory or IO) */
+/* Destroy a virtual mapping cookie for a PCI BAR (memory or IO) */
 struct pci_dev;
 extern void pci_iounmap(struct pci_dev *dev, void __iomem *);
 #else

diff --git a/include/asm-generic/pci_iomap.h b/include/asm-generic/pci_iomap.h
index e08b3bda8fe17444a02e1a34203ed9fcc6cdd001..8de4b73e19e25b8c72099bfdd90f55e5821a2e61 100644 (file)
--- a/include/asm-generic/pci_iomap.h
+++ b/include/asm-generic/pci_iomap.h
@@ -11,12 +11,11 @@
 #ifndef __ASM_GENERIC_PCI_IOMAP_H
 #define __ASM_GENERIC_PCI_IOMAP_H
 
+struct pci_dev;
 #ifdef CONFIG_PCI
 /* Create a virtual mapping cookie for a PCI BAR (memory or IO) */
-struct pci_dev;
 extern void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max);
 #else
-struct pci_dev;
 static inline void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max)
 {
        return NULL;

diff --git a/lib/pci_iomap.c b/lib/pci_iomap.c
index 40b26cbef5b4228cbcf4749690ee4c7e0c3ebfa9..4b0fdc22e688d3869c9e62005af933f8dcdd096a 100644 (file)
--- a/lib/pci_iomap.c
+++ b/lib/pci_iomap.c
@@ -6,7 +6,7 @@
 #include <linux/pci.h>
 #include <linux/io.h>
 
-#include <linux/module.h>
+#include <linux/export.h>
 
 #ifdef CONFIG_PCI
 /**