diff options
author | Colin Cross <ccross@android.com> | 2012-05-01 15:47:09 -0700 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2012-05-01 15:47:09 -0700 |
commit | aadf030d84352a91cdadf50f947da739c5611450 (patch) | |
tree | 5f22ec57ee257776b4c157f0c91f3612f05ed6c5 /kernel/events/core.c | |
parent | aad2732ba0dddcf3446a4e3c4843496759c1c305 (diff) | |
parent | 69964ea4c7b68c9399f7977aa5b9aa6539a6a98a (diff) |
Merge commit 'v3.4-rc5' into android-3.4
Diffstat (limited to 'kernel/events/core.c')
-rw-r--r-- | kernel/events/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c index a6a9ec4cd8f..fd126f82b57 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -3183,7 +3183,7 @@ static void perf_event_for_each(struct perf_event *event, perf_event_for_each_child(event, func); func(event); list_for_each_entry(sibling, &event->sibling_list, group_entry) - perf_event_for_each_child(event, func); + perf_event_for_each_child(sibling, func); mutex_unlock(&ctx->mutex); } |