The patch titled
Subject: alpha: switch to GENERIC_PCI_IOMAP
has been removed from the -mm tree. Its filename was
alpha-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: alpha: switch to GENERIC_PCI_IOMAP
alpha copied pci_iomap from generic code to avoid pulling the rest of
iomap.c in. Since that's in a separate file now, we can reuse the common
implementation.
The only difference is handling of nocache flag, that turns out to be done
correctly by the generic code since arch/alpha/include/asm/io.h defines
ioremap_nocache same as ioremap.
Signed-off-by: Michael S. Tsirkin <mst@xxxxxxxxxx>
Cc: Richard Henderson <rth@xxxxxxxxxxx>
Cc: Ivan Kokshaysky <ink@xxxxxxxxxxxxxxxxxxxx>
Cc: Matt Turner <mattst88@xxxxxxxxx>
Cc: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx>
Cc: Arnd Bergmann <arnd@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/alpha/Kconfig | 1 +
arch/alpha/kernel/pci.c | 26 +-------------------------
2 files changed, 2 insertions(+), 25 deletions(-)
diff -puN arch/alpha/Kconfig~alpha-switch-to-generic_pci_iomap arch/alpha/Kconfig
--- a/arch/alpha/Kconfig~alpha-switch-to-generic_pci_iomap
+++ a/arch/alpha/Kconfig
@@ -315,6 +315,7 @@ config ISA_DMA_API
config PCI
bool
depends on !ALPHA_JENSEN
+ select GENERIC_PCI_IOMAP
default y
help
Find out whether you have a PCI motherboard. PCI is the name of a
diff -puN arch/alpha/kernel/pci.c~alpha-switch-to-generic_pci_iomap arch/alpha/kernel/pci.c
--- a/arch/alpha/kernel/pci.c~alpha-switch-to-generic_pci_iomap
+++ a/arch/alpha/kernel/pci.c
@@ -508,30 +508,7 @@ sys_pciconfig_iobase(long which, unsigne
return -EOPNOTSUPP;
}
-/* Create an __iomem token from a PCI BAR. Copied from lib/iomap.c with
- no changes, since we don't want the other things in that object file. */
-
-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(start, len);
- if (flags & IORESOURCE_MEM) {
- /* Not checking IORESOURCE_CACHEABLE because alpha does
- not distinguish between ioremap and ioremap_nocache. */
- return ioremap(start, len);
- }
- return NULL;
-}
-
-/* Destroy that token. Not copied from lib/iomap.c. */
+/* Destroy an __iomem token. Not copied from lib/iomap.c. */
void pci_iounmap(struct pci_dev *dev, void __iomem * addr)
{
@@ -539,7 +516,6 @@ void pci_iounmap(struct pci_dev *dev, vo
iounmap(addr);
}
-EXPORT_SYMBOL(pci_iomap);
EXPORT_SYMBOL(pci_iounmap);
/* FIXME: Some boxes have multiple ISA bridges! */
_
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
