Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux

[mv-sheeva.git] / arch / powerpc / kvm / booke_interrupts.S

diff --git a/arch/powerpc/kvm/booke_interrupts.S b/arch/powerpc/kvm/booke_interrupts.S
index d0c6f841bbd10ddb4b73ef5c7609ee0726004e18..380a78cf484dc2bdce54ef4b23b26eeb60d2e264 100644 (file)
--- a/arch/powerpc/kvm/booke_interrupts.S
+++ b/arch/powerpc/kvm/booke_interrupts.S
@@ -56,8 +56,8 @@
 .macro KVM_HANDLER ivor_nr
 _GLOBAL(kvmppc_handler_\ivor_nr)
        /* Get pointer to vcpu and record exit number. */
-       mtspr   SPRN_SPRG0, r4
-       mfspr   r4, SPRN_SPRG1
+       mtspr   SPRN_SPRG_WSCRATCH0, r4
+       mfspr   r4, SPRN_SPRG_RVCPU
        stw     r5, VCPU_GPR(r5)(r4)
        stw     r6, VCPU_GPR(r6)(r4)
        mfctr   r5
@@ -95,7 +95,7 @@ _GLOBAL(kvmppc_handler_len)
 
 
 /* Registers:
- *  SPRG0: guest r4
+ *  SPRG_SCRATCH0: guest r4
  *  r4: vcpu pointer
  *  r5: KVM exit number
  */
@@ -181,7 +181,7 @@ _GLOBAL(kvmppc_resume_host)
        stw     r3, VCPU_LR(r4)
        mfxer   r3
        stw     r3, VCPU_XER(r4)
-       mfspr   r3, SPRN_SPRG0
+       mfspr   r3, SPRN_SPRG_RSCRATCH0
        stw     r3, VCPU_GPR(r4)(r4)
        mfspr   r3, SPRN_SRR0
        stw     r3, VCPU_PC(r4)
@@ -374,7 +374,7 @@ lightweight_exit:
        mtspr   SPRN_IVPR, r8
 
        /* Save vcpu pointer for the exception handlers. */
-       mtspr   SPRN_SPRG1, r4
+       mtspr   SPRN_SPRG_WVCPU, r4
 
        /* Can't switch the stack pointer until after IVPR is switched,
         * because host interrupt handlers would get confused. */
@@ -384,13 +384,13 @@ lightweight_exit:
        /* Host interrupt handlers may have clobbered these guest-readable
         * SPRGs, so we need to reload them here with the guest's values. */
        lwz     r3, VCPU_SPRG4(r4)
-       mtspr   SPRN_SPRG4, r3
+       mtspr   SPRN_SPRG4W, r3
        lwz     r3, VCPU_SPRG5(r4)
-       mtspr   SPRN_SPRG5, r3
+       mtspr   SPRN_SPRG5W, r3
        lwz     r3, VCPU_SPRG6(r4)
-       mtspr   SPRN_SPRG6, r3
+       mtspr   SPRN_SPRG6W, r3
        lwz     r3, VCPU_SPRG7(r4)
-       mtspr   SPRN_SPRG7, r3
+       mtspr   SPRN_SPRG7W, r3
 
 #ifdef CONFIG_KVM_EXIT_TIMING
        /* save enter time */