diff options
| author |   Marc Zyngier <maz@kernel.org> | 2020-09-30 14:05:35 +0100 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2020-09-30 14:05:35 +0100 |
| commit | 14ef9d04928b61d699fd0dd858b14b5d8150113e (patch) | |
| tree | 267d772b7068f7d0da04cf421286c65f2599f472 /arch/arm64/kvm/hyp/entry.S | |
| parent | Merge branch 'kvm-arm64/pmu-5.9' into kvmarm-master/next (diff) | |
| parent | Merge remote-tracking branch 'arm64/for-next/ghostbusters' into kvm-arm64/hyp-pcpu (diff) | |
| download | linux-dev-14ef9d04928b61d699fd0dd858b14b5d8150113e.tar.xz linux-dev-14ef9d04928b61d699fd0dd858b14b5d8150113e.zip | |
Merge branch 'kvm-arm64/hyp-pcpu' into kvmarm-master/next
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'arch/arm64/kvm/hyp/entry.S')
| -rw-r--r-- | arch/arm64/kvm/hyp/entry.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm64/kvm/hyp/entry.S b/arch/arm64/kvm/hyp/entry.S index afaa8d1f2485..b0afad7a99c6 100644 --- a/arch/arm64/kvm/hyp/entry.S +++ b/arch/arm64/kvm/hyp/entry.S @@ -25,7 +25,7 @@ SYM_FUNC_START(__guest_enter) // x1-x17: clobbered by macros // x29: guest context - hyp_adr_this_cpu x1, kvm_hyp_ctxt, x2 + adr_this_cpu x1, kvm_hyp_ctxt, x2 // Store the hyp regs save_callee_saved_regs x1 @@ -93,7 +93,7 @@ SYM_INNER_LABEL(__guest_exit_panic, SYM_L_GLOBAL) // return address to tail call into hyp_panic. As a side effect, the // current state is saved to the guest context but it will only be // accurate if the guest had been completely restored. - hyp_adr_this_cpu x0, kvm_hyp_ctxt, x1 + adr_this_cpu x0, kvm_hyp_ctxt, x1 adr x1, hyp_panic str x1, [x0, #CPU_XREG_OFFSET(30)] @@ -131,7 +131,7 @@ SYM_INNER_LABEL(__guest_exit, SYM_L_GLOBAL) // Store the guest's sp_el0 save_sp_el0 x1, x2 - hyp_adr_this_cpu x2, kvm_hyp_ctxt, x3 + adr_this_cpu x2, kvm_hyp_ctxt, x3 // Macro ptrauth_switch_to_hyp format: // ptrauth_switch_to_hyp(guest cxt, host cxt, tmp1, tmp2, tmp3) |