diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-05-05 20:59:27 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-05-05 20:59:27 +0100 |
| commit | 3603ab2b62ad8372fc93816b080b370dd55d7cec (patch) | |
| tree | e9012ae43fe5988c288074ee12fc4a0fc2f6b63a /arch/arm/mach-iop13xx/pci.c | |
| parent | 0af92befeb4b330c46cce6b520b2cc775cd6931f (diff) | |
| download | kernel_samsung_smdk4412-3603ab2b62ad8372fc93816b080b370dd55d7cec.zip kernel_samsung_smdk4412-3603ab2b62ad8372fc93816b080b370dd55d7cec.tar.gz kernel_samsung_smdk4412-3603ab2b62ad8372fc93816b080b370dd55d7cec.tar.bz2 | |
[ARM] mm 10: allow memory type to be specified with ioremap
__ioremap() took a set of page table flags (specifically the cacheable
and bufferable bits) to control the mapping type. However, with
the advent of ARMv6, this is far too limited.
Replace the page table flags with a memory type index, so that the
desired attributes can be selected from the mem_type table.
Finally, to prevent silent miscompilation due to the differing
arguments, rename the __ioremap() and __ioremap_pfn() functions.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-iop13xx/pci.c')
| -rw-r--r-- | arch/arm/mach-iop13xx/pci.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-iop13xx/pci.c b/arch/arm/mach-iop13xx/pci.c index 89ec70e..d85b88f 100644 --- a/arch/arm/mach-iop13xx/pci.c +++ b/arch/arm/mach-iop13xx/pci.c @@ -88,9 +88,9 @@ void iop13xx_map_pci_memory(void) if (end) { iop13xx_atux_mem_base = - (u32) __ioremap_pfn( + (u32) __arm_ioremap_pfn( __phys_to_pfn(IOP13XX_PCIX_LOWER_MEM_PA) - , 0, iop13xx_atux_mem_size, 0); + , 0, iop13xx_atux_mem_size, MT_DEVICE); if (!iop13xx_atux_mem_base) { printk("%s: atux allocation " "failed\n", __FUNCTION__); @@ -114,9 +114,9 @@ void iop13xx_map_pci_memory(void) if (end) { iop13xx_atue_mem_base = - (u32) __ioremap_pfn( + (u32) __arm_ioremap_pfn( __phys_to_pfn(IOP13XX_PCIE_LOWER_MEM_PA) - , 0, iop13xx_atue_mem_size, 0); + , 0, iop13xx_atue_mem_size, MT_DEVICE); if (!iop13xx_atue_mem_base) { printk("%s: atue allocation " "failed\n", __FUNCTION__); |