From: Ian Campbell <ian.campbell@citrix.com>
Date: Fri, 22 Feb 2013 08:58:14 +0000 (+0000)
Subject: xen: arm: p2m: use 64-bit compatible registers.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~7191
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c95d4af5bb69a76d730c8be5369ba4822b9d2ec9;p=xen.git

xen: arm: p2m: use 64-bit compatible registers.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Tim Deegan <tim@xen.org>
---

diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c
index c4fc05e6f5..1e8c8b4027 100644
--- a/xen/arch/arm/p2m.c
+++ b/xen/arch/arm/p2m.c
@@ -29,7 +29,7 @@ void p2m_load_VTTBR(struct domain *d)
 
     vttbr |= ((uint64_t)p2m->vmid&0xff)<<48;
 
-    WRITE_CP64(vttbr, VTTBR);
+    WRITE_SYSREG64(vttbr, VTTBR_EL2);
     isb(); /* Ensure update is visible */
 }
 
diff --git a/xen/include/asm-arm/cpregs.h b/xen/include/asm-arm/cpregs.h
index 35c0ee65c8..ae89e40940 100644
--- a/xen/include/asm-arm/cpregs.h
+++ b/xen/include/asm-arm/cpregs.h
@@ -277,6 +277,7 @@
 #define VBAR_EL1                VBAR
 #define VBAR_EL2                HVBAR
 #define VTCR_EL2                VTCR
+#define VTTBR_EL2               VTTBR
 
 #endif