summaryrefslogtreecommitdiffstats
path: root/arch/ia64/mm
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2019-08-11 14:30:14 +0200
committerChristoph Hellwig <hch@lst.de>2019-11-11 17:19:44 +0100
commitfded1829a24b34006664c72e580df5410fd900f5 (patch)
treedc5d47897987281e5622e9d29c418cb27441abf5 /arch/ia64/mm
parent315e5211aef97856c20609373b67ab75431202cf (diff)
downloadlinux-fded1829a24b34006664c72e580df5410fd900f5.tar.bz2
ia64: rename ioremap_nocache to ioremap_uc
On ia64 ioremap_nocache fails if attributes don't match. Not other architectures does this, and we plan to get rid of ioremap_nocache. So get rid of the special semantics and define ioremap_nocache in terms of ioremap as no portable driver could rely on the behavior anyway. However x86 implements ioremap_uc in a similar way as the ia64 version of ioremap_nocache, in that it ignores the firmware tables. Switch ia64 to override ioremap_uc instead. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/ia64/mm')
-rw-r--r--arch/ia64/mm/ioremap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/mm/ioremap.c b/arch/ia64/mm/ioremap.c
index 0c0de2c4ec69..a09cfa064536 100644
--- a/arch/ia64/mm/ioremap.c
+++ b/arch/ia64/mm/ioremap.c
@@ -99,14 +99,14 @@ ioremap (unsigned long phys_addr, unsigned long size)
EXPORT_SYMBOL(ioremap);
void __iomem *
-ioremap_nocache (unsigned long phys_addr, unsigned long size)
+ioremap_uc(unsigned long phys_addr, unsigned long size)
{
if (kern_mem_attribute(phys_addr, size) & EFI_MEMORY_WB)
return NULL;
return __ioremap_uc(phys_addr);
}
-EXPORT_SYMBOL(ioremap_nocache);
+EXPORT_SYMBOL(ioremap_uc);
void
early_iounmap (volatile void __iomem *addr, unsigned long size)