diff options
| author | Ard Biesheuvel | 2014-11-07 15:12:34 +0100 |
|---|---|---|
| committer | Will Deacon | 2014-11-07 16:04:54 +0100 |
| commit | 302cd37c417d59549d073a8986fd028998409cb9 (patch) | |
| tree | 314affe5501b52613db50019b36b78e1582a5483 /arch/arm64/kvm/hyp.S | |
| parent | arm64: ftrace: eliminate literal pool entries (diff) | |
| download | kernel-qcow2-linux-302cd37c417d59549d073a8986fd028998409cb9.tar.gz kernel-qcow2-linux-302cd37c417d59549d073a8986fd028998409cb9.tar.xz kernel-qcow2-linux-302cd37c417d59549d073a8986fd028998409cb9.zip | |
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>
Diffstat (limited to 'arch/arm64/kvm/hyp.S')
| -rw-r--r-- | arch/arm64/kvm/hyp.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/kvm/hyp.S b/arch/arm64/kvm/hyp.S index b72aa9f9215c..fbe909fb0a1a 100644 --- a/arch/arm64/kvm/hyp.S +++ b/arch/arm64/kvm/hyp.S @@ -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 |