X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Flinux%2Fperf_event.h;h=97bfe62f30d7b821bc45a000c585877925c2b964;hb=0515e5999a466dfe6e1924f460da599bb6821487;hp=8ed4326164cc843b41da6fbfe69d85cee2d61232;hpb=84e39eeb08c0ea7e9ec43ac820bf76a6fe8ecbad;p=deliverable%2Flinux.git

diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 8ed4326164cc..97bfe62f30d7 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -743,7 +743,9 @@ struct perf_event_context {
 	u64				parent_gen;
 	u64				generation;
 	int				pin_count;
+#ifdef CONFIG_CGROUP_PERF
 	int				nr_cgroups;	 /* cgroup evts */
+#endif
 	void				*task_ctx_data; /* pmu specific data */
 	struct rcu_head			rcu_head;
 };
@@ -769,7 +771,9 @@ struct perf_cpu_context {
 	unsigned int			hrtimer_active;
 
 	struct pmu			*unique_pmu;
+#ifdef CONFIG_CGROUP_PERF
 	struct perf_cgroup		*cgrp;
+#endif
 };
 
 struct perf_output_handle {
@@ -784,6 +788,11 @@ struct perf_output_handle {
 	int				page;
 };
 
+struct bpf_perf_event_data_kern {
+	struct pt_regs *regs;
+	struct perf_sample_data *data;
+};
+
 #ifdef CONFIG_CGROUP_PERF
 
 /*