Revert "x86/spec_ctrl: Add sysctl knobs to enable/disable SPEC_CTRL feature"

[mirror_ubuntu-artful-kernel.git] / include / linux / perf_event.h

diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index b14095bcf4bb40522b66716d4c1e7b59ebf72eb4..fc7ebc79e933a00ead9f018533c4008af1167ba4 100644 (file)
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -139,14 +139,6 @@ struct hw_perf_event {
                        /* for tp_event->class */
                        struct list_head        tp_list;
                };
-               struct { /* intel_cqm */
-                       int                     cqm_state;
-                       u32                     cqm_rmid;
-                       int                     is_group_event;
-                       struct list_head        cqm_events_entry;
-                       struct list_head        cqm_groups_entry;
-                       struct list_head        cqm_group_entry;
-               };
                struct { /* itrace */
                        int                     itrace_started;
                };
@@ -416,11 +408,6 @@ struct pmu {
        size_t                          task_ctx_size;
 
 
-       /*
-        * Return the count value for a counter.
-        */
-       u64 (*count)                    (struct perf_event *event); /*optional*/
-
        /*
         * Set up pmu-private data structures for an AUX area
         */
@@ -1111,11 +1098,6 @@ static inline void perf_event_task_sched_out(struct task_struct *prev,
                __perf_event_task_sched_out(prev, next);
 }
 
-static inline u64 __perf_event_count(struct perf_event *event)
-{
-       return local64_read(&event->count) + atomic64_read(&event->child_count);
-}
-
 extern void perf_event_mmap(struct vm_area_struct *vma);
 extern struct perf_guest_info_callbacks *perf_guest_cbs;
 extern int perf_register_guest_info_callbacks(struct perf_guest_info_callbacks *callbacks);
@@ -1182,6 +1164,11 @@ extern int perf_cpu_time_max_percent_handler(struct ctl_table *table, int write,
 int perf_event_max_stack_handler(struct ctl_table *table, int write,
                                 void __user *buffer, size_t *lenp, loff_t *ppos);
 
+static inline bool perf_paranoid_any(void)
+{
+       return sysctl_perf_event_paranoid > 2;
+}
+
 static inline bool perf_paranoid_tracepoint_raw(void)
 {
        return sysctl_perf_event_paranoid > -1;
@@ -1201,7 +1188,7 @@ extern void perf_event_init(void);
 extern void perf_tp_event(u16 event_type, u64 count, void *record,
                          int entry_size, struct pt_regs *regs,
                          struct hlist_head *head, int rctx,
-                         struct task_struct *task);
+                         struct task_struct *task, struct perf_event *event);
 extern void perf_bp_event(struct perf_event *event, void *data);
 
 #ifndef perf_misc_flags