x86/sev-es: Compile early handler code into kernel image

[linux-2.6-microblaze.git] / arch / powerpc / kvm / bookehv_interrupts.S

diff --git a/arch/powerpc/kvm/bookehv_interrupts.S b/arch/powerpc/kvm/bookehv_interrupts.S
index c577ba4..8262c14 100644 (file)
--- a/arch/powerpc/kvm/bookehv_interrupts.S
+++ b/arch/powerpc/kvm/bookehv_interrupts.S
@@ -434,9 +434,10 @@ _GLOBAL(kvmppc_resume_host)
 #endif
 
        /* Switch to kernel stack and jump to handler. */
-       PPC_LL  r3, HOST_RUN(r1)
+       mr      r3, r4
        mr      r5, r14 /* intno */
        mr      r14, r4 /* Save vcpu pointer. */
+       mr      r4, r5
        bl      kvmppc_handle_exit
 
        /* Restore vcpu pointer and the nonvolatiles we used. */
@@ -525,15 +526,14 @@ heavyweight_exit:
        blr
 
 /* Registers:
- *  r3: kvm_run pointer
- *  r4: vcpu pointer
+ *  r3: vcpu pointer
  */
 _GLOBAL(__kvmppc_vcpu_run)
        stwu    r1, -HOST_STACK_SIZE(r1)
-       PPC_STL r1, VCPU_HOST_STACK(r4) /* Save stack pointer to vcpu. */
+       PPC_STL r1, VCPU_HOST_STACK(r3) /* Save stack pointer to vcpu. */
 
        /* Save host state to stack. */
-       PPC_STL r3, HOST_RUN(r1)
+       mr      r4, r3
        mflr    r3
        mfcr    r5
        PPC_STL r3, HOST_STACK_LR(r1)