Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[platform/kernel/linux-rpi.git] / arch / x86 / events / perf_event.h

diff --git a/arch/x86/events/perf_event.h b/arch/x86/events/perf_event.h
index ca2f8bf..ba3d24a 100644 (file)
--- a/arch/x86/events/perf_event.h
+++ b/arch/x86/events/perf_event.h
@@ -828,7 +828,8 @@ struct x86_pmu {
                        pebs_prec_dist          :1,
                        pebs_no_tlb             :1,
                        pebs_no_isolation       :1,
-                       pebs_block              :1;
+                       pebs_block              :1,
+                       pebs_ept                :1;
        int             pebs_record_size;
        int             pebs_buffer_size;
        int             max_pebs_events;
@@ -838,6 +839,7 @@ struct x86_pmu {
        u64             (*pebs_latency_data)(struct perf_event *event, u64 status);
        unsigned long   large_pebs_flags;
        u64             rtm_abort_event;
+       u64             pebs_capable;
 
        /*
         * Intel LBR
@@ -913,7 +915,7 @@ struct x86_pmu {
        /*
         * Intel host/guest support (KVM)
         */
-       struct perf_guest_switch_msr *(*guest_get_msrs)(int *nr);
+       struct perf_guest_switch_msr *(*guest_get_msrs)(int *nr, void *data);
 
        /*
         * Check period value for PERF_EVENT_IOC_PERIOD ioctl.