The first parameter of __hyp_do_panic() was changed, so update the comment that's intended to explain the significance of passing zero. This hunk previously got lost in the merge. Fixes: c4b000c3928d ("KVM: arm64: Fix nVHE hyp panic host context restore") Signed-off-by: Andrew Scull <ascull@xxxxxxxxxx> --- Applied on 5.12-rc3. The backports of the original patch contained this hunk, and it's mainly cosmetic anyway, so no further action is needed. --- arch/arm64/kvm/hyp/nvhe/host.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/kvm/hyp/nvhe/host.S b/arch/arm64/kvm/hyp/nvhe/host.S index 5d94584840cc..c419648c1d3f 100644 --- a/arch/arm64/kvm/hyp/nvhe/host.S +++ b/arch/arm64/kvm/hyp/nvhe/host.S @@ -152,7 +152,7 @@ SYM_FUNC_END(__hyp_do_panic) .macro invalid_host_el1_vect .align 7 - mov x0, xzr /* restore_host = false */ + mov x0, xzr /* host_ctxt = NULL */ mrs x1, spsr_el2 mrs x2, elr_el2 mrs x3, par_el1 -- 2.31.0.rc2.261.g7f71774620-goog _______________________________________________ kvmarm mailing list kvmarm@xxxxxxxxxxxxxxxxxxxxx https://lists.cs.columbia.edu/mailman/listinfo/kvmarm