Commit 302cd37c authored Nov 07, 2014 by Ard Biesheuvel Committed by Will Deacon Nov 07, 2014

arm64: kvm: eliminate literal pool entries



Replace two instances of 'ldr xN, =(constant)' in the world switch
hot path with 'mov' instructions.

Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Acked-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>

parent f1ba46ee

arch/arm64/kvm/hyp.S

+2 −2

Original line number	Diff line number	Diff line
		@@ -761,10 +761,10 @@
		.macro activate_traps
		ldr x2, [x0, #VCPU_HCR_EL2]
		msr hcr_el2, x2
		ldr x2, =(CPTR_EL2_TTA)
		mov x2, #CPTR_EL2_TTA
		msr cptr_el2, x2

		ldr x2, =(1 << 15) // Trap CP15 Cr=15
		mov x2, #(1 << 15) // Trap CP15 Cr=15
		msr hstr_el2, x2

		mrs x2, mdcr_el2