Merge branch 'perf/urgent' into perf/core

Merge reason: Resolve patch dependency Signed-off-by: Ingo Molnar <mingo@elte.hu>
2010-05-07 11:30:29 +02:00 · 2010-05-07 11:30:29 +02:00 · cce9131781
commit cce9131781
parent d9f599e1e6 4fd38e4595
179 changed files with 1743 additions and 725 deletions
--- 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,