summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2012-01-31 16:02:35 +0400
committerIngo Molnar <mingo@elte.hu>2012-01-31 16:02:37 +0400
commitbb1693f89ae7f0b30c90d9b26a4f827faed1144a (patch)
treee02fc59d76d79493bffa190e492775baa134bff6 /include
parentefb3040d481a1594592b1defb4526c406c7a4751 (diff)
parent45179fec946dd554f74e950d2278dabd5ad23fd3 (diff)
downloadlinux-bb1693f89ae7f0b30c90d9b26a4f827faed1144a.tar.xz
Merge branch 'perf/urgent' into perf/core
We cherry-picked 3 commits into perf/urgent, merge them back to allow conflict-free work on those files. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include')
-rw-r--r--include/linux/perf_event.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 0b91db2522cc..412b790f5da6 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -589,6 +589,7 @@ struct hw_perf_event {
u64 sample_period;
u64 last_period;
local64_t period_left;
+ u64 interrupts_seq;
u64 interrupts;
u64 freq_time_stamp;