aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-08-25 11:24:37 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-08-25 11:24:37 -0700
commit9c9376886622b45c32f64c4444f5628dde77dfe6 (patch)
treefd24a7af7a8b795cd7583ffa9e873e063a0c6ff4 /kernel
parent87bcfa33669449e517fda718ed3c2e1899e6541b (diff)
parent4464fcaa9cbfc9c551956b48af203e2f775ca892 (diff)
downloadkernel_samsung_aries-9c9376886622b45c32f64c4444f5628dde77dfe6.zip
kernel_samsung_aries-9c9376886622b45c32f64c4444f5628dde77dfe6.tar.gz
kernel_samsung_aries-9c9376886622b45c32f64c4444f5628dde77dfe6.tar.bz2
Merge branch 'perfcounters-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perfcounters-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: perf_counter: Fix typo in read() output generation perf tools: Check perf.data owner
Diffstat (limited to 'kernel')
-rw-r--r--kernel/perf_counter.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/perf_counter.c b/kernel/perf_counter.c
index 36f65e2..f274e19 100644
--- a/kernel/perf_counter.c
+++ b/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;