diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-12-21 19:53:00 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-12-21 19:53:00 -0500 |
| commit | bb3613aa34a81a5e2f1227ccdb801fde04a7da10 (patch) | |
| tree | bb79c15d5da41113bd7b83d9e74fbfc4a1bf8569 /include/linux/perf_event.h | |
| parent | 6971071cdda79cad5f53ba390e466d696e7e9006 (diff) | |
| parent | bb1c9034b3ce7f29d3d178a87b42b767611d6574 (diff) | |
Merge branch 'pm-next' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus
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 de2c41758e29..4f1279e105ee 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h | |||
| @@ -887,6 +887,7 @@ struct perf_cpu_context { | |||
| 887 | int exclusive; | 887 | int exclusive; |
| 888 | struct list_head rotation_list; | 888 | struct list_head rotation_list; |
| 889 | int jiffies_interval; | 889 | int jiffies_interval; |
| 890 | struct pmu *active_pmu; | ||
| 890 | }; | 891 | }; |
| 891 | 892 | ||
| 892 | struct perf_output_handle { | 893 | struct perf_output_handle { |