Use INTEL_ prefix for some Intel specific macros. Plus segregate Intel and AMD specific logic in kvm code. Patches prepared on top of kvm/master (710c476514313) Ravi Bangoria (3): x86/pmu: Add INTEL_ prefix in some Intel specific macros x86/pmu: Replace X86_ALL_EVENT_FLAGS with INTEL_ALL_EVENT_FLAGS KVM: x86/pmu: Segregate Intel and AMD specific logic arch/x86/events/intel/core.c | 14 +++---- arch/x86/events/intel/ds.c | 2 +- arch/x86/events/perf_event.h | 34 ++++++++-------- arch/x86/include/asm/perf_event.h | 14 +++---- arch/x86/kvm/pmu.c | 68 +++++++++++++++++++------------ arch/x86/kvm/pmu.h | 4 +- arch/x86/kvm/svm/pmu.c | 6 ++- arch/x86/kvm/vmx/pmu_intel.c | 6 +-- 8 files changed, 85 insertions(+), 63 deletions(-) -- 2.27.0