From: Julien Grall <julien.grall@arm.com>
Date: Wed, 21 Feb 2018 13:46:23 +0000 (+0000)
Subject: xen/arm: setup: use maddr_to_mfn rather than _mfn(paddr_to_pfn(...))
X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~222
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c8d474db606d92496e6284b98cd212b954fbc4b6;p=xen.git

xen/arm: setup: use maddr_to_mfn rather than _mfn(paddr_to_pfn(...))

Signed-off-by: Julien Grall <julien.grall@arm.com>
Reviewed-by: George Dunlap <george.dunlap@citrix.com>
Acked-by: Stefano Stabellini <sstabellini@kernel.org>
---

diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c
index e6f8e23abd..6e49e8fd1f 100644
--- a/xen/arch/arm/setup.c
+++ b/xen/arch/arm/setup.c
@@ -268,8 +268,8 @@ void __init discard_initial_modules(void)
         if ( mi->module[i].kind == BOOTMOD_XEN )
             continue;
 
-        if ( !mfn_valid(_mfn(paddr_to_pfn(s))) ||
-             !mfn_valid(_mfn(paddr_to_pfn(e))))
+        if ( !mfn_valid(maddr_to_mfn(s)) ||
+             !mfn_valid(maddr_to_mfn(e)) )
             continue;
 
         dt_unreserved_regions(s, e, init_domheap_pages, 0);