| Message ID | 20200515152550.83810-1-dbrazdil@google.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 438f711ce1d889632467be80779c8f5762b107d7 |
| Headers | show |
| Series | arm64: kvm: Fix incorrect comment on kvm_get_hyp_vector() | expand |
On Fri, 15 May 2020 16:25:50 +0100, David Brazdil wrote: > The comment used to say that kvm_get_hyp_vector is only called on VHE systems. > In fact, it is also called from the nVHE init function cpu_init_hyp_mode(). > Fix the comment to stop confusing devs. > > Signed-off-by: David Brazdil <dbrazdil@google.com> > Signed-off-by: Marc Zyngier <maz@kernel.org> > Link: https://lore.kernel.org/r/20200515152550.83810-1-dbrazdil@google.com > > [...] Applied to kvmarm-master/next, thanks! [1/1] KVM: arm64: Fix incorrect comment on kvm_get_hyp_vector() commit: 438f711ce1d889632467be80779c8f5762b107d7 Cheers, M.
diff --git a/arch/arm64/include/asm/kvm_mmu.h b/arch/arm64/include/asm/kvm_mmu.h index 30b0e8d6b895..796f6a2e794a 100644 --- a/arch/arm64/include/asm/kvm_mmu.h +++ b/arch/arm64/include/asm/kvm_mmu.h @@ -473,7 +473,7 @@ static inline int kvm_write_guest_lock(struct kvm *kvm, gpa_t gpa, extern void *__kvm_bp_vect_base; extern int __kvm_harden_el2_vector_slot; -/* This is only called on a VHE system */ +/* This is called on both VHE and !VHE systems */ static inline void *kvm_get_hyp_vector(void) { struct bp_hardening_data *data = arm64_get_bp_hardening_data();
The comment used to say that kvm_get_hyp_vector is only called on VHE systems. In fact, it is also called from the nVHE init function cpu_init_hyp_mode(). Fix the comment to stop confusing devs. Signed-off-by: David Brazdil <dbrazdil@google.com> --- arch/arm64/include/asm/kvm_mmu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)