[Qemu-ppc] [RFC PATCH 14/17] KVM: PPC32: bookehv: Remove GET_VCPU macro from exception handler

[Mihai Caraman]

GET_VCPU define will not be implemented for 64-bit for performance reasons
so get rid of it also on 32-bit.

Signed-off-by: Mihai Caraman <address@hidden>
---
 arch/powerpc/kvm/bookehv_interrupts.S |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/arch/powerpc/kvm/bookehv_interrupts.S 
b/arch/powerpc/kvm/bookehv_interrupts.S
index 6048a00..dff8ed4 100644
--- a/arch/powerpc/kvm/bookehv_interrupts.S
+++ b/arch/powerpc/kvm/bookehv_interrupts.S
@@ -32,9 +32,6 @@
 
 #include "../kernel/head_booke.h" /* for THREAD_NORMSAVE() */
 
-#define GET_VCPU(vcpu, thread) \
-       PPC_LL  vcpu, THREAD_KVM_VCPU(thread)
-
 #define LONGBYTES              (BITS_PER_LONG / 8)
 
 #define VCPU_GPR(n)            (VCPU_GPRS + (n * LONGBYTES))
@@ -210,7 +207,7 @@
  */
 .macro kvm_handler intno srr0, srr1, flags
 _GLOBAL(kvmppc_handler_\intno\()_\srr1)
-       GET_VCPU(r11, r10)
+       PPC_LL  r11, THREAD_KVM_VCPU(r10)
        PPC_STL r3, VCPU_GPR(r3)(r11)
        mfspr   r3, SPRN_SPRG_RSCRATCH0
        PPC_STL r4, VCPU_GPR(r4)(r11)
@@ -237,7 +234,7 @@ _GLOBAL(kvmppc_handler_\intno\()_\srr1)
 .macro kvm_lvl_handler intno scratch srr0, srr1, flags
 _GLOBAL(kvmppc_handler_\intno\()_\srr1)
        mfspr   r10, SPRN_SPRG_THREAD
-       GET_VCPU(r11, r10)
+       PPC_LL  r11, THREAD_KVM_VCPU(r10)
        PPC_STL r3, VCPU_GPR(r3)(r11)
        mfspr   r3, \scratch
        PPC_STL r4, VCPU_GPR(r4)(r11)
-- 
1.7.4.1