diff options
| author | Marc Zyngier <maz@kernel.org> | 2020-07-28 16:26:16 +0100 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2020-07-28 16:26:16 +0100 |
| commit | a394cf6e854d40968d43693597532a242019e337 (patch) | |
| tree | 7bf6e1db24c7cabeccfafe6001c91daa642412f4 /arch/arm64/include/asm/kvm_asm.h | |
| parent | c9dc95005a681cf93c4012f7cc75eaa0ad12bfdc (diff) | |
| parent | a59a2edbbba7397fede86e40a3da17e5beebf98b (diff) | |
Merge branch 'kvm-arm64/misc-5.9' into kvmarm-master/next-WIP
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'arch/arm64/include/asm/kvm_asm.h')
| -rw-r--r-- | arch/arm64/include/asm/kvm_asm.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/kvm_asm.h b/arch/arm64/include/asm/kvm_asm.h index dc37a5055137..fb1a922b31ba 100644 --- a/arch/arm64/include/asm/kvm_asm.h +++ b/arch/arm64/include/asm/kvm_asm.h @@ -191,7 +191,6 @@ extern char __smccc_workaround_1_smc[__SMCCC_WORKAROUND_1_SMC_SZ]; .macro get_vcpu_ptr vcpu, ctxt get_host_ctxt \ctxt, \vcpu ldr \vcpu, [\ctxt, #HOST_CONTEXT_VCPU] - kern_hyp_va \vcpu .endm #endif |