The patch titled
Subject: mips: switch to GENERIC_PCI_IOMAP
has been removed from the -mm tree. Its filename was
mips-switch-to-generic_pci_iomap.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
From: "Michael S. Tsirkin" <mst@xxxxxxxxxx>
Subject: mips: switch to GENERIC_PCI_IOMAP
mips copied pci_iomap from generic code, probably to avoid pulling the
rest of iomap.c in. Since that's in a separate file now, we can reuse the
common implementation.
Signed-off-by: Michael S. Tsirkin <mst@xxxxxxxxxx>
Cc: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
Cc: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx>
Cc: Arnd Bergmann <arnd@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/mips/Kconfig | 1 +
arch/mips/lib/iomap-pci.c | 26 --------------------------
2 files changed, 1 insertion(+), 26 deletions(-)
diff -puN arch/mips/Kconfig~mips-switch-to-generic_pci_iomap arch/mips/Kconfig
--- a/arch/mips/Kconfig~mips-switch-to-generic_pci_iomap
+++ a/arch/mips/Kconfig
@@ -2354,6 +2354,7 @@ config PCI
bool "Support for PCI controller"
depends on HW_HAS_PCI
select PCI_DOMAINS
+ select GENERIC_PCI_IOMAP
help
Find out whether you have a PCI motherboard. PCI is the name of a
bus system, i.e. the way the CPU talks to the other stuff inside
diff -puN arch/mips/lib/iomap-pci.c~mips-switch-to-generic_pci_iomap arch/mips/lib/iomap-pci.c
--- a/arch/mips/lib/iomap-pci.c~mips-switch-to-generic_pci_iomap
+++ a/arch/mips/lib/iomap-pci.c
@@ -40,32 +40,6 @@ static void __iomem *ioport_map_pci(stru
return (void __iomem *) (ctrl->io_map_base + port);
}
-/*
- * Create a virtual mapping cookie for a PCI BAR (memory or IO)
- */
-void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
-{
- resource_size_t start = pci_resource_start(dev, bar);
- resource_size_t len = pci_resource_len(dev, bar);
- unsigned long flags = pci_resource_flags(dev, bar);
-
- if (!len || !start)
- return NULL;
- if (maxlen && len > maxlen)
- len = maxlen;
- if (flags & IORESOURCE_IO)
- return ioport_map_pci(dev, start, len);
- if (flags & IORESOURCE_MEM) {
- if (flags & IORESOURCE_CACHEABLE)
- return ioremap(start, len);
- return ioremap_nocache(start, len);
- }
- /* What? */
- return NULL;
-}
-
-EXPORT_SYMBOL(pci_iomap);
-
void pci_iounmap(struct pci_dev *dev, void __iomem * addr)
{
iounmap(addr);
_
Patches currently in -mm which might be from mst@xxxxxxxxxx are
linux-next.patch
lib-add-generic_pci_iomap-v2.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
