From 25d8af2f099ac634001777b61316b41ce68dc75f Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Wed, 23 Nov 2011 12:34:20 +0100 Subject: [PATCH] --- yaml --- r: 277317 b: refs/heads/master c: 1d9b482e78d3b16f97f85a82849f82db7eed3102 h: refs/heads/master i: 277315: 3a14ac0583148e5623a03b0139ebceae88f739f7 v: v3 --- [refs] | 2 +- trunk/kernel/events/core.c | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 81438119f01a..e7be34d761f4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4defea8559bc0f97a899d94c8d19d3b8bb802bc4 +refs/heads/master: 1d9b482e78d3b16f97f85a82849f82db7eed3102 diff --git a/trunk/kernel/events/core.c b/trunk/kernel/events/core.c index b3fed52aaf20..eeda5403590c 100644 --- a/trunk/kernel/events/core.c +++ b/trunk/kernel/events/core.c @@ -1667,8 +1667,7 @@ perf_install_in_context(struct perf_event_context *ctx, * Note: this works for group members as well as group leaders * since the non-leader members' sibling_lists will be empty. */ -static void __perf_event_mark_enabled(struct perf_event *event, - struct perf_event_context *ctx) +static void __perf_event_mark_enabled(struct perf_event *event) { struct perf_event *sub; u64 tstamp = perf_event_time(event); @@ -1706,7 +1705,7 @@ static int __perf_event_enable(void *info) */ perf_cgroup_set_timestamp(current, ctx); - __perf_event_mark_enabled(event, ctx); + __perf_event_mark_enabled(event); if (!event_filter_match(event)) { if (is_cgroup_event(event)) @@ -1787,7 +1786,7 @@ void perf_event_enable(struct perf_event *event) retry: if (!ctx->is_active) { - __perf_event_mark_enabled(event, ctx); + __perf_event_mark_enabled(event); goto out; } @@ -2466,7 +2465,7 @@ static int event_enable_on_exec(struct perf_event *event, if (event->state >= PERF_EVENT_STATE_INACTIVE) return 0; - __perf_event_mark_enabled(event, ctx); + __perf_event_mark_enabled(event); return 1; }