From: Juergen Gross <jgross@suse.com>
Date: Wed, 16 Nov 2022 08:17:46 +0100
Subject: [PATCH] kABI: Fix kABI after "KVM: x86/pmu: Use different raw
 event masks for AMD and Intel"
Patch-mainline: Never, kABI fix
References: git-fixes

Signed-off-by: Juergen Gross <jgross@suse.com>
---
 arch/x86/include/asm/kvm_host.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index 453cc5e3d28b..d632d14ab053 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -495,6 +495,9 @@ struct kvm_pmu {
 	unsigned nr_arch_gp_counters;
 	unsigned nr_arch_fixed_counters;
 	unsigned available_event_types;
+#ifndef __GENKSYMS__
+	u8 version;
+#endif
 	u64 fixed_ctr_ctrl;
 	u64 global_ctrl;
 	u64 global_status;
@@ -503,8 +506,11 @@ struct kvm_pmu {
 	u64 global_ctrl_mask;
 	u64 global_ovf_ctrl_mask;
 	u64 reserved_bits;
+#ifndef __GENKSYMS__
 	u64 raw_event_mask;
+#else
 	u8 version;
+#endif
 	struct kvm_pmc gp_counters[INTEL_PMC_MAX_GENERIC];
 	struct kvm_pmc fixed_counters[INTEL_PMC_MAX_FIXED];
 	struct irq_work irq_work;
-- 
2.25.0