[Xen-changelog] [xen stable-4.4] xen: arm: correct backport of 84ca4629d0aa

[patchbot@xxxxxxx]

commit 0336012573cd98e373f908259f11abab3c1b2880
Author:     Ian Campbell <ian.campbell@xxxxxxxxxx>
AuthorDate: Thu Jun 5 14:02:42 2014 +0100
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Thu Jun 5 14:05:13 2014 +0100

    xen: arm: correct backport of 84ca4629d0aa
    
    This hunk from "Move p2m context save/restore in a separate
    function" was accidentally dropped in the backport done to 4.4 as
    commit 9ca83a4bd3bf.
    
    Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
 xen/arch/arm/p2m.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c
index e068f74..bc81b67 100644
--- a/xen/arch/arm/p2m.c
+++ b/xen/arch/arm/p2m.c
@@ -65,6 +65,9 @@ void p2m_restore_state(struct vcpu *n)
     else
         hcr |= HCR_RW;
 
+    WRITE_SYSREG(n->arch.sctlr, SCTLR_EL1);
+    isb();
+
     WRITE_SYSREG(hcr, HCR_EL2);
     isb();
 }
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.4

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog