Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 489f781a authored by Catalin Marinas's avatar Catalin Marinas
Browse files

arm64: Use pgprot_t as the last argument when invoking __ioremap() 



Even if it works with since the types have the same size, the correct
type of the last __ioremap() argument is pgprot_t rather than pteval_t.

Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 6f0c0580

arch/arm64/include/asm/io.h

+3 −3
Original line number Diff line number Diff line
@@ -225,9 +225,9 @@ extern void __iounmap(volatile void __iomem *addr); 
#define PROT_DEVICE_nGnRE	(PROT_DEFAULT | PTE_XN | PTE_ATTRINDX(MT_DEVICE_nGnRE))

#define PROT_NORMAL_NC		(PROT_DEFAULT | PTE_ATTRINDX(MT_NORMAL_NC))



#define ioremap(addr, size)		__ioremap((addr), (size), PROT_DEVICE_nGnRE)

#define ioremap_nocache(addr, size)	__ioremap((addr), (size), PROT_DEVICE_nGnRE)

#define ioremap_wc(addr, size)		__ioremap((addr), (size), PROT_NORMAL_NC)

#define ioremap(addr, size)		__ioremap((addr), (size), __pgprot(PROT_DEVICE_nGnRE))

#define ioremap_nocache(addr, size)	__ioremap((addr), (size), __pgprot(PROT_DEVICE_nGnRE))

#define ioremap_wc(addr, size)		__ioremap((addr), (size), __pgprot(PROT_NORMAL_NC))

#define iounmap				__iounmap



#define ARCH_HAS_IOREMAP_WC