From: Ian Campbell Date: Thu, 8 Aug 2013 12:15:15 +0000 (+0100) Subject: xen: arm: allow virt_to_maddr to take either a pointer or an integer X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~6495 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=530cef20c3c2b9c58e73d7a768665464f20653e7;p=xen.git xen: arm: allow virt_to_maddr to take either a pointer or an integer This seems to be expected by common code which passes both pointers and unsigned long as virtual addresses. The latter case in particular is in init_node_heap() under a DIRECTMAP_VIRT_END #ifdef, which is why it hasn't affected us yet (but will in a subsequent patch). The new prototypes match the x86 versions apart from using vaddr_t instead of unsigned long. Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini --- diff --git a/xen/include/asm-arm/mm.h b/xen/include/asm-arm/mm.h index baaf9c3833..7aca8364f6 100644 --- a/xen/include/asm-arm/mm.h +++ b/xen/include/asm-arm/mm.h @@ -208,11 +208,12 @@ static inline void __iomem *ioremap_wc(paddr_t start, size_t len) #define paddr_to_pdx(pa) pfn_to_pdx(paddr_to_pfn(pa)) -static inline paddr_t virt_to_maddr(const void *va) +static inline paddr_t __virt_to_maddr(vaddr_t va) { - uint64_t par = va_to_par((vaddr_t)va); - return (par & PADDR_MASK & PAGE_MASK) | ((vaddr_t) va & ~PAGE_MASK); + uint64_t par = va_to_par(va); + return (par & PADDR_MASK & PAGE_MASK) | (va & ~PAGE_MASK); } +#define virt_to_maddr(va) __virt_to_maddr((vaddr_t)(va)) static inline void *maddr_to_virt(paddr_t ma) {