diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-02-22 17:04:41 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-02-22 17:04:41 -0500 |
| commit | 61b80086a525c8a6081257ae40da5dee2bcaee16 (patch) | |
| tree | 675da35e4c03be3a5ca17bf6430e5b51dfed6296 /include/linux/perf_event.h | |
| parent | a5f17d1f4c2831b9b9bf8b1a537cdbac995d6e13 (diff) | |
| parent | 230f984662d7e0e4a9597c665fd4f53130666e7d (diff) | |
Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux into for-armsoc
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 08855613ceb3..abb2776be1ba 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h | |||
| @@ -587,6 +587,7 @@ struct hw_perf_event { | |||
| 587 | u64 sample_period; | 587 | u64 sample_period; |
| 588 | u64 last_period; | 588 | u64 last_period; |
| 589 | local64_t period_left; | 589 | local64_t period_left; |
| 590 | u64 interrupts_seq; | ||
| 590 | u64 interrupts; | 591 | u64 interrupts; |
| 591 | 592 | ||
| 592 | u64 freq_time_stamp; | 593 | u64 freq_time_stamp; |