diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-05-07 11:30:29 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-05-07 11:30:30 +0200 |
| commit | cce913178118b0b36742eb7544c2b38a0c957ee7 (patch) | |
| tree | 25a6d7b4e01fea2932e6e2962a75f7a3d8c19a4f /include/linux/perf_event.h | |
| parent | d9f599e1e6d019968b35d2dc63074b9e8964fa69 (diff) | |
| parent | 4fd38e4595e2f6c9d27732c042a0e16b2753049c (diff) | |
Merge branch 'perf/urgent' into perf/core
Merge reason: Resolve patch dependency
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/perf_event.h')
| -rw-r--r-- | include/linux/perf_event.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index ace31fbac513..6be4a0f9137c 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -548,6 +548,7 @@ struct pmu { * enum perf_event_active_state - the states of a event */ enum perf_event_active_state { + PERF_EVENT_STATE_FREE = -3, PERF_EVENT_STATE_ERROR = -2, PERF_EVENT_STATE_OFF = -1, PERF_EVENT_STATE_INACTIVE = 0, |