From 9b8acbcd021974b641deeeb281eee4390c362714 Mon Sep 17 00:00:00 2001
From: Stephane Eranian <eranian@google.com>
Date: Mon, 23 Nov 2009 21:40:49 -0800
Subject: [PATCH] --- yaml --- r: 169768 b: refs/heads/master c:
 184d3da8ef0ca552dffa0fdd35c046e058a2cf9a h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/kernel/perf_event.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7827400a3c85..ab166c3d778a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b23d5767a5818caec8547d0bce1588b02bdecd30
+refs/heads/master: 184d3da8ef0ca552dffa0fdd35c046e058a2cf9a
diff --git a/trunk/kernel/perf_event.c b/trunk/kernel/perf_event.c
index 9425c9600c89..accfd7bfe387 100644
--- a/trunk/kernel/perf_event.c
+++ b/trunk/kernel/perf_event.c
@@ -1831,7 +1831,7 @@ static int perf_event_read_group(struct perf_event *event,
 
 		size = n * sizeof(u64);
 
-		if (copy_to_user(buf + size, values, size)) {
+		if (copy_to_user(buf + ret, values, size)) {
 			ret = -EFAULT;
 			goto unlock;
 		}