3 files changed, 3 insertions, 7 deletions

diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
index 97d37278ea2d..11ae3d8ba3a2 100644
--- a/arch/powerpc/include/asm/reg.h
+++ b/arch/powerpc/include/asm/reg.h
@@ -919,8 +919,6 @@
 #define SPRN_SPRG_RSCRATCH_DBG  SPRN_SPRG9
 #define SPRN_SPRG_WSCRATCH_DBG  SPRN_SPRG9
 #endif
-#define SPRN_SPRG_RVCPU         SPRN_SPRG1
-#define SPRN_SPRG_WVCPU         SPRN_SPRG1
 #endif
 
 #ifdef CONFIG_8xx
diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c
index 4e23ba2f3ca7..46f6afd2172a 100644
--- a/arch/powerpc/kernel/asm-offsets.c
+++ b/arch/powerpc/kernel/asm-offsets.c
@@ -117,7 +117,7 @@ int main(void)
 #ifdef CONFIG_KVM_BOOK3S_32_HANDLER
         DEFINE(THREAD_KVM_SVCPU, offsetof(struct thread_struct, kvm_shadow_vcpu));
 #endif
-#ifdef CONFIG_KVM_BOOKE_HV
+#if defined(CONFIG_KVM) && defined(CONFIG_BOOKE)
         DEFINE(THREAD_KVM_VCPU, offsetof(struct thread_struct, kvm_vcpu));
 #endif
 
diff --git a/arch/powerpc/kvm/booke_interrupts.S b/arch/powerpc/kvm/booke_interrupts.S
index bb46b32f9813..ca16d57f7686 100644
--- a/arch/powerpc/kvm/booke_interrupts.S
+++ b/arch/powerpc/kvm/booke_interrupts.S
@@ -56,7 +56,8 @@
 _GLOBAL(kvmppc_handler_\ivor_nr)
         /* Get pointer to vcpu and record exit number. */
         mtspr   \scratch , r4
-        mfspr   r4, SPRN_SPRG_RVCPU
+        mfspr   r4, SPRN_SPRG_THREAD
+        lwz     r4, THREAD_KVM_VCPU(r4)
         stw     r3, VCPU_GPR(R3)(r4)
         stw     r5, VCPU_GPR(R5)(r4)
         stw     r6, VCPU_GPR(R6)(r4)
@@ -402,9 +403,6 @@ lightweight_exit:
         lwz     r8, kvmppc_booke_handlers@l(r8)
         mtspr   SPRN_IVPR, r8
 
-        /* Save vcpu pointer for the exception handlers. */
-        mtspr   SPRN_SPRG_WVCPU, r4
-
         lwz     r5, VCPU_SHARED(r4)
 
         /* Can't switch the stack pointer until after IVPR is switched,