From 6c12a6778cd061a3c3143a9daae8c204f2a0b8be Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Fri, 21 Aug 2009 17:19:36 +0200 Subject: [PATCH] --- yaml --- r: 157087 b: refs/heads/master c: 4464fcaa9cbfc9c551956b48af203e2f775ca892 h: refs/heads/master i: 157085: 2cd3d74f4244d11177def2e196e47eaa7952b616 157083: 6e515600c967e69f4aee377c9cd5dcd0f9289630 157079: 3473cd56f271a1c344759ff498f0c2fdc337a4c5 157071: 81d914add44c955f19ae2c8839ee9ec30eba7203 157055: 2093ba6b4a24257dc87ae3f484d3d4f79b1932ed v: v3 --- [refs] | 2 +- trunk/kernel/perf_counter.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b41329fedc69..52cab463d131 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fa6963b2481beff8b11f76006fbb63fdbbf2d2d7 +refs/heads/master: 4464fcaa9cbfc9c551956b48af203e2f775ca892 diff --git a/trunk/kernel/perf_counter.c b/trunk/kernel/perf_counter.c index 36f65e2b8b57..f274e1959885 100644 --- a/trunk/kernel/perf_counter.c +++ b/trunk/kernel/perf_counter.c @@ -1791,7 +1791,7 @@ static int perf_counter_read_group(struct perf_counter *counter, size += err; list_for_each_entry(sub, &leader->sibling_list, list_entry) { - err = perf_counter_read_entry(counter, read_format, + err = perf_counter_read_entry(sub, read_format, buf + size); if (err < 0) return err;