[Top] [All Lists]

[ 04/34] MIPS: Expose missing pci_io{map,unmap} declarations

Subject: [ 04/34] MIPS: Expose missing pci_io{map,unmap} declarations
From: Greg Kroah-Hartman <>
Date: Sun, 18 Aug 2013 13:34:17 -0700
Cc: Greg Kroah-Hartman <>,, Markos Chandras <>, "Steven J. Hill" <>, Ralf Baechle <>, Guenter Roeck <>,
In-reply-to: <>
List-archive: <>
List-help: <>
List-id: linux-mips <>
List-owner: <>
List-post: <>
List-software: Ecartis version 1.0.0
List-subscribe: <>
List-unsubscribe: <>
Original-recipient: rfc822;
References: <>
User-agent: quilt/0.60-1
3.4-stable review patch.  If anyone has any objections, please let me know.


From: Markos Chandras <>

commit 78857614104a26cdada4c53eea104752042bf5a1 upstream.

The GENERIC_PCI_IOMAP does not depend on CONFIG_PCI so move
it to the CONFIG_MIPS symbol so it's always selected for MIPS.
This fixes the missing pci_iomap declaration for MIPS.
Moreover, the pci_iounmap function was not defined in the
io.h header file if the CONFIG_PCI symbol is not set,
but it should since MIPS is not using CONFIG_GENERIC_IOMAP.

This fixes the following problem on a allyesconfig:

drivers/net/ethernet/3com/3c59x.c:1031:2: error: implicit declaration of
function 'pci_iomap' [-Werror=implicit-function-declaration]
drivers/net/ethernet/3com/3c59x.c:1044:3: error: implicit declaration of
function 'pci_iounmap' [-Werror=implicit-function-declaration]

Signed-off-by: Markos Chandras <>
Acked-by: Steven J. Hill <>
Signed-off-by: Ralf Baechle <>
Cc: Guenter Roeck <>
Signed-off-by: Greg Kroah-Hartman <>

 arch/mips/Kconfig          |    2 +-
 arch/mips/include/asm/io.h |    5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -24,6 +24,7 @@ config MIPS
        select GENERIC_IRQ_PROBE
        select GENERIC_IRQ_SHOW
+       select GENERIC_PCI_IOMAP
        select HAVE_ARCH_JUMP_LABEL
        select HAVE_MEMBLOCK
@@ -2356,7 +2357,6 @@ config PCI
        bool "Support for PCI controller"
        depends on HW_HAS_PCI
        select PCI_DOMAINS
-       select GENERIC_PCI_IOMAP
          Find out whether you have a PCI motherboard. PCI is the name of a
--- a/arch/mips/include/asm/io.h
+++ b/arch/mips/include/asm/io.h
@@ -168,6 +168,11 @@ static inline void * isa_bus_to_virt(uns
 extern void __iomem * __ioremap(phys_t offset, phys_t size, unsigned long 
 extern void __iounmap(const volatile void __iomem *addr);
+#ifndef CONFIG_PCI
+struct pci_dev;
+static inline void pci_iounmap(struct pci_dev *dev, void __iomem *addr) {}
 static inline void __iomem * __ioremap_mode(phys_t offset, unsigned long size,
        unsigned long flags)

<Prev in Thread] Current Thread [Next in Thread>
  • [ 04/34] MIPS: Expose missing pci_io{map,unmap} declarations, Greg Kroah-Hartman <=