diff options
| author | Tejun Heo <tj@kernel.org> | 2011-05-24 03:59:36 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2011-05-24 03:59:36 -0400 |
| commit | 6988f20fe04e9ef3aea488cb8ab57fbeb78e12f0 (patch) | |
| tree | c9d7fc50a2e2147a5ca07e3096e7eeb916ad2da9 /include/linux/perf_event.h | |
| parent | 0415b00d175e0d8945e6785aad21b5f157976ce0 (diff) | |
| parent | 6ea0c34dac89611126455537552cffe6c7e832ad (diff) | |
Merge branch 'fixes-2.6.39' into for-2.6.40
Diffstat (limited to 'include/linux/perf_event.h')
| -rw-r--r-- | include/linux/perf_event.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index f495c014724..311b4dc785a 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h | |||
| @@ -938,9 +938,7 @@ struct perf_cpu_context { | |||
| 938 | struct list_head rotation_list; | 938 | struct list_head rotation_list; |
| 939 | int jiffies_interval; | 939 | int jiffies_interval; |
| 940 | struct pmu *active_pmu; | 940 | struct pmu *active_pmu; |
| 941 | #ifdef CONFIG_CGROUP_PERF | ||
| 942 | struct perf_cgroup *cgrp; | 941 | struct perf_cgroup *cgrp; |
| 943 | #endif | ||
| 944 | }; | 942 | }; |
| 945 | 943 | ||
| 946 | struct perf_output_handle { | 944 | struct perf_output_handle { |