diff options
author | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-18 17:06:00 -0400 |
---|---|---|
committer | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-18 17:06:00 -0400 |
commit | a215aa7b9ab3759c047201199fba64d3042d7f13 (patch) | |
tree | bca37493d9b2233450e6d3ffced1261d0e4f71fe /include/linux/perf_event.h | |
parent | d31199a77ef606f1d06894385f1852181ba6136b (diff) |
Update 2.6.36 to 2.6.36.4wip-dissipation2-jerickso
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 716f99b682c1..1d42c6ecd00a 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h | |||
@@ -788,6 +788,7 @@ struct perf_event_context { | |||
788 | int nr_active; | 788 | int nr_active; |
789 | int is_active; | 789 | int is_active; |
790 | int nr_stat; | 790 | int nr_stat; |
791 | int rotate_disable; | ||
791 | atomic_t refcount; | 792 | atomic_t refcount; |
792 | struct task_struct *task; | 793 | struct task_struct *task; |
793 | 794 | ||