aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/perf_event.h1
-rw-r--r--kernel/perf_event.c5
2 files changed, 0 insertions, 6 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,
diff --git a/kernel/perf_event.c b/kernel/perf_event.c
index 180151ff8376..a9047463fd83 100644
--- a/kernel/perf_event.c
+++ b/kernel/perf_event.c
@@ -334,9 +334,6 @@ list_del_event(struct perf_event *event, struct perf_event_context *ctx)
334 if (event->state > PERF_EVENT_STATE_OFF) 334 if (event->state > PERF_EVENT_STATE_OFF)
335 event->state = PERF_EVENT_STATE_OFF; 335 event->state = PERF_EVENT_STATE_OFF;
336 336
337 if (event->state > PERF_EVENT_STATE_FREE)
338 return;
339
340 /* 337 /*
341 * If this was a group event with sibling events then 338 * If this was a group event with sibling events then
342 * upgrade the siblings to singleton events by adding them 339 * upgrade the siblings to singleton events by adding them
@@ -1871,8 +1868,6 @@ int perf_event_release_kernel(struct perf_event *event)
1871{ 1868{
1872 struct perf_event_context *ctx = event->ctx; 1869 struct perf_event_context *ctx = event->ctx;
1873 1870
1874 event->state = PERF_EVENT_STATE_FREE;
1875
1876 WARN_ON_ONCE(ctx->parent_ctx); 1871 WARN_ON_ONCE(ctx->parent_ctx);
1877 /* 1872 /*
1878 * There are two ways this annotation is useful: 1873 * There are two ways this annotation is useful: