diff options
Diffstat (limited to 'kernel/events/core.c')
-rw-r--r-- | kernel/events/core.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c index b3fed52aaf20..eeda5403590c 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c | |||
@@ -1667,8 +1667,7 @@ retry: | |||
1667 | * Note: this works for group members as well as group leaders | 1667 | * Note: this works for group members as well as group leaders |
1668 | * since the non-leader members' sibling_lists will be empty. | 1668 | * since the non-leader members' sibling_lists will be empty. |
1669 | */ | 1669 | */ |
1670 | static void __perf_event_mark_enabled(struct perf_event *event, | 1670 | static void __perf_event_mark_enabled(struct perf_event *event) |
1671 | struct perf_event_context *ctx) | ||
1672 | { | 1671 | { |
1673 | struct perf_event *sub; | 1672 | struct perf_event *sub; |
1674 | u64 tstamp = perf_event_time(event); | 1673 | u64 tstamp = perf_event_time(event); |
@@ -1706,7 +1705,7 @@ static int __perf_event_enable(void *info) | |||
1706 | */ | 1705 | */ |
1707 | perf_cgroup_set_timestamp(current, ctx); | 1706 | perf_cgroup_set_timestamp(current, ctx); |
1708 | 1707 | ||
1709 | __perf_event_mark_enabled(event, ctx); | 1708 | __perf_event_mark_enabled(event); |
1710 | 1709 | ||
1711 | if (!event_filter_match(event)) { | 1710 | if (!event_filter_match(event)) { |
1712 | if (is_cgroup_event(event)) | 1711 | if (is_cgroup_event(event)) |
@@ -1787,7 +1786,7 @@ void perf_event_enable(struct perf_event *event) | |||
1787 | 1786 | ||
1788 | retry: | 1787 | retry: |
1789 | if (!ctx->is_active) { | 1788 | if (!ctx->is_active) { |
1790 | __perf_event_mark_enabled(event, ctx); | 1789 | __perf_event_mark_enabled(event); |
1791 | goto out; | 1790 | goto out; |
1792 | } | 1791 | } |
1793 | 1792 | ||
@@ -2466,7 +2465,7 @@ static int event_enable_on_exec(struct perf_event *event, | |||
2466 | if (event->state >= PERF_EVENT_STATE_INACTIVE) | 2465 | if (event->state >= PERF_EVENT_STATE_INACTIVE) |
2467 | return 0; | 2466 | return 0; |
2468 | 2467 | ||
2469 | __perf_event_mark_enabled(event, ctx); | 2468 | __perf_event_mark_enabled(event); |
2470 | 2469 | ||
2471 | return 1; | 2470 | return 1; |
2472 | } | 2471 | } |