]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
perf: Remove duplicate invocation on perf_event_for_each
authorNamhyung Kim <namhyung.kim@lge.com>
Thu, 31 May 2012 05:51:44 +0000 (14:51 +0900)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Thu, 31 May 2012 17:01:00 +0000 (14:01 -0300)
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

index 5b06cbbf6931da0ab7c4e9f1b27a76f5418d64d8..f85c0154b333a02c6a611cf8eca55362ab7f7eaf 100644 (file)
@@ -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);