Merge tag 'pci-v4.4-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

[firefly-linux-kernel-4.4.55.git] / arch / arm64 / kvm / hyp.S

diff --git a/arch/arm64/kvm/hyp.S b/arch/arm64/kvm/hyp.S
index e5836138ec42a58841e7003bbb14f2b4a2126297..1599701ef044b28b2534a3766dde1d255dba103a 100644 (file)
--- a/arch/arm64/kvm/hyp.S
+++ b/arch/arm64/kvm/hyp.S
@@ -880,6 +880,14 @@ __kvm_hyp_panic:
 
        bl __restore_sysregs
 
+       /*
+        * Make sure we have a valid host stack, and don't leave junk in the
+        * frame pointer that will give us a misleading host stack unwinding.
+        */
+       ldr     x22, [x2, #CPU_GP_REG_OFFSET(CPU_SP_EL1)]
+       msr     sp_el1, x22
+       mov     x29, xzr
+
 1:     adr     x0, __hyp_panic_str
        adr     x1, 2f
        ldp     x2, x3, [x1]