From: Catalin Marinas Date: Tue, 13 Oct 2015 15:18:17 +0000 (+0100) Subject: Revert "arm64: ioremap: add ioremap_cache macro" X-Git-Tag: v4.4-rc1~26^2~63 X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=52fa1927e953d8b1fbdcf8a19dc75c1499cc3d5d;p=cascardo%2Flinux.git Revert "arm64: ioremap: add ioremap_cache macro" This reverts commit 1b6d7f8742d5d46c478f10c9e57da18d049b116d. This patch would conflict with Dan Williams' "tree-wide convert to memremap()" series (ioremap_cache replaced by arch_memremap) Signed-off-by: Catalin Marinas --- diff --git a/arch/arm64/include/asm/io.h b/arch/arm64/include/asm/io.h index d6b620c9a112..44be1e03ed65 100644 --- a/arch/arm64/include/asm/io.h +++ b/arch/arm64/include/asm/io.h @@ -172,7 +172,6 @@ extern void __iomem *ioremap_cache(phys_addr_t phys_addr, size_t size); #define ioremap_wc(addr, size) __ioremap((addr), (size), __pgprot(PROT_NORMAL_NC)) #define ioremap_wt(addr, size) __ioremap((addr), (size), __pgprot(PROT_DEVICE_nGnRE)) #define iounmap __iounmap -#define ioremap_cache ioremap_cache /* * io{read,write}{16,32}be() macros