diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-11 03:22:14 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-11 03:22:14 -0500 |
| commit | ffc046729381ec039a87dc2c00d2899fcc8785e3 (patch) | |
| tree | 78859e5c19c1eae24aef9319a212ffede1263c89 /include/linux | |
| parent | 95fd4845ed0ffcab305b4f30ce1c12dc34f1b56c (diff) | |
| parent | 0475f9ea8e2cc030298908949e0d5da9f2fc2cfe (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/perfcounters into perfcounters/core
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/perf_counter.h | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/include/linux/perf_counter.h b/include/linux/perf_counter.h index f55381fbcac9..c83f51d6e359 100644 --- a/include/linux/perf_counter.h +++ b/include/linux/perf_counter.h | |||
| @@ -83,14 +83,17 @@ struct perf_counter_hw_event { | |||
| 83 | u64 irq_period; | 83 | u64 irq_period; |
| 84 | u32 record_type; | 84 | u32 record_type; |
| 85 | 85 | ||
| 86 | u32 disabled : 1, /* off by default */ | 86 | u32 disabled : 1, /* off by default */ |
| 87 | nmi : 1, /* NMI sampling */ | 87 | nmi : 1, /* NMI sampling */ |
| 88 | raw : 1, /* raw event type */ | 88 | raw : 1, /* raw event type */ |
| 89 | inherit : 1, /* children inherit it */ | 89 | inherit : 1, /* children inherit it */ |
| 90 | pinned : 1, /* must always be on PMU */ | 90 | pinned : 1, /* must always be on PMU */ |
| 91 | exclusive : 1, /* only counter on PMU */ | 91 | exclusive : 1, /* only group on PMU */ |
| 92 | 92 | exclude_user : 1, /* don't count user */ | |
| 93 | __reserved_1 : 26; | 93 | exclude_kernel : 1, /* ditto kernel */ |
| 94 | exclude_hv : 1, /* ditto hypervisor */ | ||
| 95 | |||
| 96 | __reserved_1 : 23; | ||
| 94 | 97 | ||
| 95 | u64 __reserved_2; | 98 | u64 __reserved_2; |
| 96 | }; | 99 | }; |