arm64/kvm: use alternative auto-nop
authorMark Rutland <mark.rutland@arm.com>
Wed, 7 Sep 2016 10:07:10 +0000 (11:07 +0100)
committerWill Deacon <will.deacon@arm.com>
Mon, 12 Sep 2016 09:46:07 +0000 (10:46 +0100)
commite506236a7b8140d73b35fee80f7e38c794dd931d
tree79098881bd7f91c836667c9c66e018d742d5e619
parent6ba3b554f5b9b53cb99c0edb93f0ea855fbc712a
arm64/kvm: use alternative auto-nop

Make use of the new alternative_if and alternative_else_nop_endif and
get rid of our open-coded NOP sleds, making the code simpler to read.

Note that for __kvm_call_hyp the branch to __vhe_hyp_call has been moved
out of the alternative sequence, and in the default case there will be
four additional NOPs executed.

Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: kvmarm@lists.cs.columbia.edu
Acked-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
arch/arm64/include/asm/kvm_mmu.h
arch/arm64/kvm/hyp.S