From 3f6de28cc28ede28a08c8c340000204b64c6dfdc Mon Sep 17 00:00:00 2001 From: Yong Wang Date: Wed, 3 Jun 2009 16:42:25 +0800 Subject: [PATCH] --- yaml --- r: 147646 b: refs/heads/master c: 3aff27ca84fa94311ae99189e54fed8d83b69fc1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/Documentation/perf_counter/design.txt | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 1f88cefbaee9..90e2aa507e17 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1b58c2515be48d5df79d20210ac5a86e30094de2 +refs/heads/master: 3aff27ca84fa94311ae99189e54fed8d83b69fc1 diff --git a/trunk/Documentation/perf_counter/design.txt b/trunk/Documentation/perf_counter/design.txt index 9930c4bddc6f..d3250763dc92 100644 --- a/trunk/Documentation/perf_counter/design.txt +++ b/trunk/Documentation/perf_counter/design.txt @@ -48,7 +48,6 @@ struct perf_counter_hw_event { __u32 read_format; __u64 disabled : 1, /* off by default */ - nmi : 1, /* NMI sampling */ inherit : 1, /* children inherit it */ pinned : 1, /* must always be on PMU */ exclusive : 1, /* only group on PMU */ @@ -195,12 +194,6 @@ The 'disabled' bit specifies whether the counter starts out disabled or enabled. If it is initially disabled, it can be enabled by ioctl or prctl (see below). -The 'nmi' bit specifies, for hardware events, whether the counter -should be set up to request non-maskable interrupts (NMIs) or normal -interrupts. This bit is ignored if the user doesn't have -CAP_SYS_ADMIN privilege (i.e. is not root) or if the CPU doesn't -generate NMIs from hardware counters. - The 'inherit' bit, if set, specifies that this counter should count events on descendant tasks as well as the task specified. This only applies to new descendents, not to any existing descendents at the