Merge tag 'kvmarm-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmar...

[mirror_ubuntu-jammy-kernel.git] / arch / arm64 / include / asm / kvm_host.h

diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h
index 61d9749284d16f1fec9e2435fcb594a965e2508c..41911585ae0cfa3db73e6c67b78e88e0e781a118 100644 (file)
--- a/arch/arm64/include/asm/kvm_host.h
+++ b/arch/arm64/include/asm/kvm_host.h
@@ -566,16 +566,11 @@ static inline bool __vcpu_write_sys_reg_to_cpu(u64 val, int reg)
 }
 
 struct kvm_vm_stat {
-       ulong remote_tlb_flush;
+       struct kvm_vm_stat_generic generic;
 };
 
 struct kvm_vcpu_stat {
-       u64 halt_successful_poll;
-       u64 halt_attempted_poll;
-       u64 halt_poll_success_ns;
-       u64 halt_poll_fail_ns;
-       u64 halt_poll_invalid;
-       u64 halt_wakeup;
+       struct kvm_vcpu_stat_generic generic;
        u64 hvc_exit_stat;
        u64 wfe_exit_stat;
        u64 wfi_exit_stat;