diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-10 21:04:27 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-10 21:04:27 -0500 |
commit | e343a895a9f342f239c5e3c5ffc6c0b1707e6244 (patch) | |
tree | 46c81c6ae375b1f14e209b13c8ac020842807ece /arch/arm/mm | |
parent | 06792c4dde2ad143928cc95c1ba218c6269c494b (diff) | |
parent | 193a667fba76b3df482cbf865228e26ee246e889 (diff) |
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
lib: use generic pci_iomap on all architectures
Many architectures don't want to pull in iomap.c,
so they ended up duplicating pci_iomap from that file.
That function isn't trivial, and we are going to modify it
https://lkml.org/lkml/2011/11/14/183
so the duplication hurts.
This reduces the scope of the problem significantly,
by moving pci_iomap to a separate file and
referencing that from all architectures.
* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
alpha: drop pci_iomap/pci_iounmap from pci-noop.c
mn10300: switch to GENERIC_PCI_IOMAP
mn10300: add missing __iomap markers
frv: switch to GENERIC_PCI_IOMAP
tile: switch to GENERIC_PCI_IOMAP
tile: don't panic on iomap
sparc: switch to GENERIC_PCI_IOMAP
sh: switch to GENERIC_PCI_IOMAP
powerpc: switch to GENERIC_PCI_IOMAP
parisc: switch to GENERIC_PCI_IOMAP
mips: switch to GENERIC_PCI_IOMAP
microblaze: switch to GENERIC_PCI_IOMAP
arm: switch to GENERIC_PCI_IOMAP
alpha: switch to GENERIC_PCI_IOMAP
lib: add GENERIC_PCI_IOMAP
lib: move GENERIC_IOMAP to lib/Kconfig
Fix up trivial conflicts due to changes nearby in arch/{m68k,score}/Kconfig
Diffstat (limited to 'arch/arm/mm')
-rw-r--r-- | arch/arm/mm/iomap.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/arch/arm/mm/iomap.c b/arch/arm/mm/iomap.c index 430df1a5978d..e62956e12030 100644 --- a/arch/arm/mm/iomap.c +++ b/arch/arm/mm/iomap.c | |||
@@ -35,27 +35,6 @@ EXPORT_SYMBOL(pcibios_min_mem); | |||
35 | unsigned int pci_flags = PCI_REASSIGN_ALL_RSRC; | 35 | unsigned int pci_flags = PCI_REASSIGN_ALL_RSRC; |
36 | EXPORT_SYMBOL(pci_flags); | 36 | EXPORT_SYMBOL(pci_flags); |
37 | 37 | ||
38 | void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen) | ||
39 | { | ||
40 | resource_size_t start = pci_resource_start(dev, bar); | ||
41 | resource_size_t len = pci_resource_len(dev, bar); | ||
42 | unsigned long flags = pci_resource_flags(dev, bar); | ||
43 | |||
44 | if (!len || !start) | ||
45 | return NULL; | ||
46 | if (maxlen && len > maxlen) | ||
47 | len = maxlen; | ||
48 | if (flags & IORESOURCE_IO) | ||
49 | return ioport_map(start, len); | ||
50 | if (flags & IORESOURCE_MEM) { | ||
51 | if (flags & IORESOURCE_CACHEABLE) | ||
52 | return ioremap(start, len); | ||
53 | return ioremap_nocache(start, len); | ||
54 | } | ||
55 | return NULL; | ||
56 | } | ||
57 | EXPORT_SYMBOL(pci_iomap); | ||
58 | |||
59 | void pci_iounmap(struct pci_dev *dev, void __iomem *addr) | 38 | void pci_iounmap(struct pci_dev *dev, void __iomem *addr) |
60 | { | 39 | { |
61 | if ((unsigned long)addr >= VMALLOC_START && | 40 | if ((unsigned long)addr >= VMALLOC_START && |