From 5a6d85d22228cc8c6f4d241f5b0fe880a82ed4c1 Mon Sep 17 00:00:00 2001 From: Mihai Caraman Date: Thu, 11 Oct 2012 06:13:20 +0000 Subject: [PATCH] --- yaml --- r: 343581 b: refs/heads/master c: ff594746845877c0a6402be23897df659188eacb h: refs/heads/master i: 343579: baf015dc15f1f94fe50e343fbd67ab4c17066061 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kvm/bookehv_interrupts.S | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 3fad5b825cc8..186a6f534339 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b50df19cccdd169d5345b5169699446b80ee051a +refs/heads/master: ff594746845877c0a6402be23897df659188eacb diff --git a/trunk/arch/powerpc/kvm/bookehv_interrupts.S b/trunk/arch/powerpc/kvm/bookehv_interrupts.S index 099fe8272b57..fa6d5529ebfb 100644 --- a/trunk/arch/powerpc/kvm/bookehv_interrupts.S +++ b/trunk/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_GUEST_SPRG(n) (VCPU_GUEST_SPRGS + (n * LONGBYTES)) @@ -206,7 +203,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) @@ -233,7 +230,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)