aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/perf_event.h6
-rw-r--r--kernel/events/core.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 79b18a20cf5d..b7532650de47 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -485,9 +485,9 @@ struct perf_addr_filters_head {
485}; 485};
486 486
487/** 487/**
488 * enum perf_event_active_state - the states of a event 488 * enum perf_event_state - the states of a event
489 */ 489 */
490enum perf_event_active_state { 490enum perf_event_state {
491 PERF_EVENT_STATE_DEAD = -4, 491 PERF_EVENT_STATE_DEAD = -4,
492 PERF_EVENT_STATE_EXIT = -3, 492 PERF_EVENT_STATE_EXIT = -3,
493 PERF_EVENT_STATE_ERROR = -2, 493 PERF_EVENT_STATE_ERROR = -2,
@@ -578,7 +578,7 @@ struct perf_event {
578 struct pmu *pmu; 578 struct pmu *pmu;
579 void *pmu_private; 579 void *pmu_private;
580 580
581 enum perf_event_active_state state; 581 enum perf_event_state state;
582 unsigned int attach_state; 582 unsigned int attach_state;
583 local64_t count; 583 local64_t count;
584 atomic64_t child_count; 584 atomic64_t child_count;
diff --git a/kernel/events/core.c b/kernel/events/core.c
index b249e0f197a7..6322e245176c 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -10801,7 +10801,7 @@ inherit_event(struct perf_event *parent_event,
10801 struct perf_event *group_leader, 10801 struct perf_event *group_leader,
10802 struct perf_event_context *child_ctx) 10802 struct perf_event_context *child_ctx)
10803{ 10803{
10804 enum perf_event_active_state parent_state = parent_event->state; 10804 enum perf_event_state parent_state = parent_event->state;
10805 struct perf_event *child_event; 10805 struct perf_event *child_event;
10806 unsigned long flags; 10806 unsigned long flags;
10807 10807