Merge branch 'linus' into smp/hotplug

Apply upstream changes to avoid conflicts with pending patches.

1 files changed, 4 insertions, 0 deletions

diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 8ed4326164cc..2b6b43cc0dd5 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 {