aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/perf_event.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2010-05-11 02:31:49 -0400
committerIngo Molnar <mingo@elte.hu>2010-05-11 02:31:49 -0400
commite3174cfd2a1e28fff774681f00a0eef3d31da970 (patch)
tree5706316d689a9b1fe11df562bed391295deff537 /include/linux/perf_event.h
parente61a639a794063d78fd248a37ce2c21d5c81fc19 (diff)
Revert "perf: Fix exit() vs PERF_FORMAT_GROUP"
This reverts commit 4fd38e4595e2f6c9d27732c042a0e16b2753049c. It causes various crashes and hangs when events are activated. The cause is not fully understood yet but we need to revert it because the effects are severe. Reported-by: Stephane Eranian <eranian@google.com> Reported-by: Lin Ming <ming.m.lin@intel.com> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com> Cc: Mike Galbraith <efault@gmx.de> Cc: Paul Mackerras <paulus@samba.org> Cc: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> LKML-Reference: <new-submission> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/perf_event.h')
-rw-r--r--include/linux/perf_event.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 4924c96d7e2d..3fd5c82e0e18 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -575,7 +575,6 @@ struct pmu {
575 * enum perf_event_active_state - the states of a event 575 * enum perf_event_active_state - the states of a event
576 */ 576 */
577enum perf_event_active_state { 577enum perf_event_active_state {
578 PERF_EVENT_STATE_FREE = -3,
579 PERF_EVENT_STATE_ERROR = -2, 578 PERF_EVENT_STATE_ERROR = -2,
580 PERF_EVENT_STATE_OFF = -1, 579 PERF_EVENT_STATE_OFF = -1,
581 PERF_EVENT_STATE_INACTIVE = 0, 580 PERF_EVENT_STATE_INACTIVE = 0,