diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-12-16 05:22:25 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-12-16 05:22:27 -0500 |
| commit | 006b20fe4c69189b0d854e5eabf269e50ca86cdd (patch) | |
| tree | 948b08825a36114c85ddc2bfcd965c261e32810f /include/linux/perf_event.h | |
| parent | 5f29805a4f4627e766f862ff9f10c14f5f314359 (diff) | |
| parent | d949750fed168b6553ca11ed19e4affd19d7a4d7 (diff) | |
Merge branch 'perf/urgent' into perf/core
Merge reason: We want to apply a dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/perf_event.h')
| -rw-r--r-- | include/linux/perf_event.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index 2814ead4adb8..30e50e2c7f30 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h | |||
| @@ -900,6 +900,7 @@ struct perf_cpu_context { | |||
| 900 | int exclusive; | 900 | int exclusive; |
| 901 | struct list_head rotation_list; | 901 | struct list_head rotation_list; |
| 902 | int jiffies_interval; | 902 | int jiffies_interval; |
| 903 | struct pmu *active_pmu; | ||
| 903 | }; | 904 | }; |
| 904 | 905 | ||
| 905 | struct perf_output_handle { | 906 | struct perf_output_handle { |