aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kernel/events/core.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c
index 15e58d4ea035..132524c8b340 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -7818,6 +7818,7 @@ inherit_event(struct perf_event *parent_event,
7818 struct perf_event *group_leader, 7818 struct perf_event *group_leader,
7819 struct perf_event_context *child_ctx) 7819 struct perf_event_context *child_ctx)
7820{ 7820{
7821 enum perf_event_active_state parent_state = parent_event->state;
7821 struct perf_event *child_event; 7822 struct perf_event *child_event;
7822 unsigned long flags; 7823 unsigned long flags;
7823 7824
@@ -7851,7 +7852,7 @@ inherit_event(struct perf_event *parent_event,
7851 * not its attr.disabled bit. We hold the parent's mutex, 7852 * not its attr.disabled bit. We hold the parent's mutex,
7852 * so we won't race with perf_event_{en, dis}able_family. 7853 * so we won't race with perf_event_{en, dis}able_family.
7853 */ 7854 */
7854 if (parent_event->state >= PERF_EVENT_STATE_INACTIVE) 7855 if (parent_state >= PERF_EVENT_STATE_INACTIVE)
7855 child_event->state = PERF_EVENT_STATE_INACTIVE; 7856 child_event->state = PERF_EVENT_STATE_INACTIVE;
7856 else 7857 else
7857 child_event->state = PERF_EVENT_STATE_OFF; 7858 child_event->state = PERF_EVENT_STATE_OFF;