From: Luca Miccio <206497@studenti.unimore.it>
Date: Mon, 6 Jan 2020 13:46:12 +0000 (+0100)
Subject: Restore setup_pagetables xen_paddr argument
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=c2f5409b01068f210521f48519f02fde0cd91e70;p=people%2Fsstabellini%2Fxen-unstable.git%2F.git

Restore setup_pagetables xen_paddr argument

Signed-off-by: Luca Miccio <206497@studenti.unimore.it>
---

diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c
index 971332861d..577c531a6d 100644
--- a/xen/arch/arm/mm.c
+++ b/xen/arch/arm/mm.c
@@ -634,7 +634,7 @@ static void clear_table(void *table)
 
 /* Boot-time pagetable setup.
  * Changes here may need matching changes in head.S */
-void __init setup_pagetables(unsigned long boot_phys_offset)
+void __init setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr)
 {
     uint64_t ttbr;
     lpae_t pte, *p;
diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c
index d9bbb672b3..9c89c7d8fe 100644
--- a/xen/arch/arm/setup.c
+++ b/xen/arch/arm/setup.c
@@ -805,7 +805,7 @@ void __init start_xen(unsigned long boot_phys_offset,
     /* Initialize traps early allow us to get backtrace when an error occurred */
     init_traps();
 
-    setup_pagetables(boot_phys_offset);
+    setup_pagetables(boot_phys_offset, 0);
 
     smp_clear_cpu_maps();
 
diff --git a/xen/include/asm-arm/mm.h b/xen/include/asm-arm/mm.h
index 333efd3a60..6b4eef2dd2 100644
--- a/xen/include/asm-arm/mm.h
+++ b/xen/include/asm-arm/mm.h
@@ -170,7 +170,7 @@ extern unsigned long total_pages;
 #define PDX_GROUP_SHIFT SECOND_SHIFT
 
 /* Boot-time pagetable setup */
-extern void setup_pagetables(unsigned long boot_phys_offset);
+extern void setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr);
 /* Map FDT in boot pagetable */
 extern void *early_fdt_map(paddr_t fdt_paddr);
 /* Remove early mappings */