From: Steffen Eiden The s390 arm64 vcpu struct mirrors arm64's kvm_vcpu_arch. When commit e64309198eda2 ("KVM: arm64: Turn vcpu->arch.pause into a counter") changed the type of kvm_vcpu_arch.pause from bool to atomic_t, the merge into this tree missed the s390 copy, leaving it out of sync. Nothing on the s390 side accesses vcpu->arch.pause yet, so this has no functional effect. Align the type to keep the mirror identical to its arm64 counterpart. Fixes: e6c329180d1d ("KVM: s390: arm64: Introduce host definitions") Signed-off-by: Steffen Eiden Signed-off-by: Andreas Grapentin --- arch/s390/include/asm/kvm_host_arm64.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/s390/include/asm/kvm_host_arm64.h b/arch/s390/include/asm/kvm_host_arm64.h index 82343e723ebf..a3e40650d75d 100644 --- a/arch/s390/include/asm/kvm_host_arm64.h +++ b/arch/s390/include/asm/kvm_host_arm64.h @@ -63,11 +63,10 @@ struct kvm_vcpu_arch { /* * Don't run the guest (internal implementation need). * - * Contrary to the flags above, this is set/cleared outside of - * a vcpu context, and thus cannot be mixed with the flags - * themselves (or the flag accesses need to be made atomic). + * Contrary to the flags above, this is updated outside of + * a vcpu context, and thus cannot be mixed with the flags. */ - bool pause; + atomic_t pause; /* vcpu power state */ struct kvm_mp_state mp_state; -- 2.55.0