Messages in this thread Patch in this message | | | Date | Wed, 6 Jun 2012 00:09:36 -0700 | From | tip-bot for Namhyung Kim <> | Subject | [tip:perf/urgent] perf: Remove duplicate invocation on perf_event_for_each |
| |
Commit-ID: cb7225feec627e91d598198996429e9ee6804f8d Gitweb: http://git.kernel.org/tip/cb7225feec627e91d598198996429e9ee6804f8d Author: Namhyung Kim <namhyung.kim@lge.com> AuthorDate: Thu, 31 May 2012 14:51:44 +0900 Committer: Arnaldo Carvalho de Melo <acme@redhat.com> CommitDate: Thu, 31 May 2012 14:01:00 -0300
perf: Remove duplicate invocation on perf_event_for_each
The @func callback was invoked twice for group leader when perf_event_for_each() called. It seems the commit 75f937f24bd9 ("perf_counter: Fix ctx->mutex vs counter ->mutex inversion") made the mistake during the change.
Signed-off-by: Namhyung Kim <namhyung.kim@lge.com> Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Namhyung Kim <namhyung@gmail.com> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/r/1338443506-25009-1-git-send-email-namhyung.kim@lge.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> --- kernel/events/core.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/kernel/events/core.c b/kernel/events/core.c index 5b06cbb..f85c015 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -3181,7 +3181,6 @@ static void perf_event_for_each(struct perf_event *event, event = event->group_leader; perf_event_for_each_child(event, func); - func(event); list_for_each_entry(sibling, &event->sibling_list, group_entry) perf_event_for_each_child(sibling, func); mutex_unlock(&ctx->mutex);
| |