From: Julien Grall <julien.grall@arm.com>
Date: Tue, 13 Jun 2017 16:13:17 +0000 (+0100)
Subject: xen/arm: mm: Use typesafe MFN in dump_pt_walk
X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~1986
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=534ecddd8a961a44356fcab576bd68d6900bfa74;p=xen.git

xen/arm: mm: Use typesafe MFN in dump_pt_walk

Signed-off-by: Julien Grall <julien.grall@arm.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
---

diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c
index 3b92abffc4..7b313ca123 100644
--- a/xen/arch/arm/mm.c
+++ b/xen/arch/arm/mm.c
@@ -181,7 +181,7 @@ void dump_pt_walk(paddr_t ttbr, paddr_t addr,
                   unsigned int nr_root_tables)
 {
     static const char *level_strs[4] = { "0TH", "1ST", "2ND", "3RD" };
-    const unsigned long root_pfn = paddr_to_pfn(ttbr);
+    const mfn_t root_mfn = maddr_to_mfn(ttbr);
     const unsigned int offsets[4] = {
         zeroeth_table_offset(addr),
         first_table_offset(addr),
@@ -215,7 +215,7 @@ void dump_pt_walk(paddr_t ttbr, paddr_t addr,
     else
         root_table = 0;
 
-    mapping = map_domain_page(_mfn(root_pfn + root_table));
+    mapping = map_domain_page(mfn_add(root_mfn, root_table));
 
     for ( level = root_level; ; level++ )
     {