diff options
author | Yong Wang <yong.y.wang@linux.intel.com> | 2009-06-03 04:42:25 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-06-04 07:20:12 -0400 |
commit | 3aff27ca84fa94311ae99189e54fed8d83b69fc1 (patch) | |
tree | 071e132ebb220c67f5b4b68e67a88f55fbb4272d | |
parent | 1b58c2515be48d5df79d20210ac5a86e30094de2 (diff) |
perf_counter: Documentation update
The 'nmi' bit is no longer there.
Signed-off-by: Yong Wang <yong.y.wang@intel.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Arjan van de Ven <arjan@linux.intel.com>
LKML-Reference: <20090603084225.GA6553@ywang-moblin2.bj.intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r-- | Documentation/perf_counter/design.txt | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/Documentation/perf_counter/design.txt b/Documentation/perf_counter/design.txt index 9930c4bddc6f..d3250763dc92 100644 --- a/Documentation/perf_counter/design.txt +++ b/Documentation/perf_counter/design.txt | |||
@@ -48,7 +48,6 @@ struct perf_counter_hw_event { | |||
48 | __u32 read_format; | 48 | __u32 read_format; |
49 | 49 | ||
50 | __u64 disabled : 1, /* off by default */ | 50 | __u64 disabled : 1, /* off by default */ |
51 | nmi : 1, /* NMI sampling */ | ||
52 | inherit : 1, /* children inherit it */ | 51 | inherit : 1, /* children inherit it */ |
53 | pinned : 1, /* must always be on PMU */ | 52 | pinned : 1, /* must always be on PMU */ |
54 | exclusive : 1, /* only group on PMU */ | 53 | exclusive : 1, /* only group on PMU */ |
@@ -195,12 +194,6 @@ The 'disabled' bit specifies whether the counter starts out disabled | |||
195 | or enabled. If it is initially disabled, it can be enabled by ioctl | 194 | or enabled. If it is initially disabled, it can be enabled by ioctl |
196 | or prctl (see below). | 195 | or prctl (see below). |
197 | 196 | ||
198 | The 'nmi' bit specifies, for hardware events, whether the counter | ||
199 | should be set up to request non-maskable interrupts (NMIs) or normal | ||
200 | interrupts. This bit is ignored if the user doesn't have | ||
201 | CAP_SYS_ADMIN privilege (i.e. is not root) or if the CPU doesn't | ||
202 | generate NMIs from hardware counters. | ||
203 | |||
204 | The 'inherit' bit, if set, specifies that this counter should count | 197 | The 'inherit' bit, if set, specifies that this counter should count |
205 | events on descendant tasks as well as the task specified. This only | 198 | events on descendant tasks as well as the task specified. This only |
206 | applies to new descendents, not to any existing descendents at the | 199 | applies to new descendents, not to any existing descendents at the |