diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-11 09:22:14 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-11 09:22:14 +0100 |
| 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 { u64 irq_period; u32 record_type; - u32 disabled : 1, /* off by default */ - nmi : 1, /* NMI sampling */ - raw : 1, /* raw event type */ - inherit : 1, /* children inherit it */ - pinned : 1, /* must always be on PMU */ - exclusive : 1, /* only counter on PMU */ - - __reserved_1 : 26; + u32 disabled : 1, /* off by default */ + nmi : 1, /* NMI sampling */ + raw : 1, /* raw event type */ + inherit : 1, /* children inherit it */ + pinned : 1, /* must always be on PMU */ + exclusive : 1, /* only group on PMU */ + exclude_user : 1, /* don't count user */ + exclude_kernel : 1, /* ditto kernel */ + exclude_hv : 1, /* ditto hypervisor */ + + __reserved_1 : 23; u64 __reserved_2; }; |