diff options
Diffstat (limited to 'arch/arm/mm/ioremap.c')
-rw-r--r-- | arch/arm/mm/ioremap.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c index f9c32ba73544..d1e5ad7ab3bc 100644 --- a/arch/arm/mm/ioremap.c +++ b/arch/arm/mm/ioremap.c | |||
@@ -438,6 +438,13 @@ void __arm_iounmap(volatile void __iomem *io_addr) | |||
438 | EXPORT_SYMBOL(__arm_iounmap); | 438 | EXPORT_SYMBOL(__arm_iounmap); |
439 | 439 | ||
440 | #ifdef CONFIG_PCI | 440 | #ifdef CONFIG_PCI |
441 | static int pci_ioremap_mem_type = MT_DEVICE; | ||
442 | |||
443 | void pci_ioremap_set_mem_type(int mem_type) | ||
444 | { | ||
445 | pci_ioremap_mem_type = mem_type; | ||
446 | } | ||
447 | |||
441 | int pci_ioremap_io(unsigned int offset, phys_addr_t phys_addr) | 448 | int pci_ioremap_io(unsigned int offset, phys_addr_t phys_addr) |
442 | { | 449 | { |
443 | BUG_ON(offset + SZ_64K > IO_SPACE_LIMIT); | 450 | BUG_ON(offset + SZ_64K > IO_SPACE_LIMIT); |
@@ -445,7 +452,7 @@ int pci_ioremap_io(unsigned int offset, phys_addr_t phys_addr) | |||
445 | return ioremap_page_range(PCI_IO_VIRT_BASE + offset, | 452 | return ioremap_page_range(PCI_IO_VIRT_BASE + offset, |
446 | PCI_IO_VIRT_BASE + offset + SZ_64K, | 453 | PCI_IO_VIRT_BASE + offset + SZ_64K, |
447 | phys_addr, | 454 | phys_addr, |
448 | __pgprot(get_mem_type(MT_DEVICE)->prot_pte)); | 455 | __pgprot(get_mem_type(pci_ioremap_mem_type)->prot_pte)); |
449 | } | 456 | } |
450 | EXPORT_SYMBOL_GPL(pci_ioremap_io); | 457 | EXPORT_SYMBOL_GPL(pci_ioremap_io); |
451 | #endif | 458 | #endif |