Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff594746 authored by Mihai Caraman's avatar Mihai Caraman Committed by Alexander Graf
Browse files

KVM: PPC: bookehv: Remove GET_VCPU macro from exception handler 



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: default avatarMihai Caraman <mihai.caraman@freescale.com>
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent b50df19c

arch/powerpc/kvm/bookehv_interrupts.S

+2 −5
Original line number Original line Diff line number Diff line
@@ -32,9 +32,6 @@ 




#include "../kernel/head_booke.h" /* for THREAD_NORMSAVE() */

#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 LONGBYTES		(BITS_PER_LONG / 8)





#define VCPU_GUEST_SPRG(n)	(VCPU_GUEST_SPRGS + (n * LONGBYTES))

#define VCPU_GUEST_SPRG(n)	(VCPU_GUEST_SPRGS + (n * LONGBYTES))
@@ -206,7 +203,7 @@ 
 */

 */

.macro kvm_handler intno srr0, srr1, flags

.macro kvm_handler intno srr0, srr1, flags

_GLOBAL(kvmppc_handler_\intno\()_\srr1)

_GLOBAL(kvmppc_handler_\intno\()_\srr1)

	GET_VCPU(r11, r10)

	PPC_LL	r11, THREAD_KVM_VCPU(r10)

	PPC_STL r3, VCPU_GPR(R3)(r11)

	PPC_STL r3, VCPU_GPR(R3)(r11)

	mfspr	r3, SPRN_SPRG_RSCRATCH0

	mfspr	r3, SPRN_SPRG_RSCRATCH0

	PPC_STL	r4, VCPU_GPR(R4)(r11)

	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

.macro kvm_lvl_handler intno scratch srr0, srr1, flags

_GLOBAL(kvmppc_handler_\intno\()_\srr1)

_GLOBAL(kvmppc_handler_\intno\()_\srr1)

	mfspr	r10, SPRN_SPRG_THREAD

	mfspr	r10, SPRN_SPRG_THREAD

	GET_VCPU(r11, r10)

	PPC_LL	r11, THREAD_KVM_VCPU(r10)

	PPC_STL r3, VCPU_GPR(R3)(r11)

	PPC_STL r3, VCPU_GPR(R3)(r11)

	mfspr	r3, \scratch

	mfspr	r3, \scratch

	PPC_STL	r4, VCPU_GPR(R4)(r11)

	PPC_STL	r4, VCPU_GPR(R4)(r11)