From: Al Stone ahs3@redhat.com
With the use of early_memremap() available, we can now clear up some macro definitions in preparation for upstream submittal.
Signed-off-by: Al Stone al.stone@linaro.org --- arch/arm/include/asm/io.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h index 426a13a..77c025a 100644 --- a/arch/arm/include/asm/io.h +++ b/arch/arm/include/asm/io.h @@ -328,12 +328,7 @@ extern void _memset_io(volatile void __iomem *, int, size_t); */ #define ioremap(cookie,size) __arm_ioremap((cookie), (size), MT_DEVICE) #define ioremap_nocache(cookie,size) __arm_ioremap((cookie), (size), MT_DEVICE) -/* - * BOZO: is this just mis-named as ioremap_cached()? - * renaming it to ioremap_cache() to find out for now. - #define ioremap_cached(cookie,size) __arm_ioremap((cookie), (size), MT_DEVICE_CACHED) - */ -#define ioremap_cache(cookie,size) __arm_ioremap((cookie), (size), MT_DEVICE_CACHED) +#define ioremap_cached(cookie, size) __arm_ioremap((cookie), (size), MT_DEVICE_CACHED) #define ioremap_wc(cookie,size) __arm_ioremap((cookie), (size), MT_DEVICE_WC) #define iounmap __arm_iounmap
@@ -415,7 +410,7 @@ extern void early_ioremap_reset(void); extern void __iomem *early_remap(resource_size_t phys_addr, unsigned long size, u32 prot); #define early_ioremap(x, y) early_remap(x, y, L_PTE_MT_DEV_NONSHARED) -#define early_memremap(x, y) early_remap(x, y, L_PTE_MT_UNCACHED) +#define early_memremap(x, y) early_remap(x, y, L_PTE_MT_WRITEALLOC)
extern void early_iounmap(void __iomem *addr, unsigned long size);