diff --git a/[refs] b/[refs]
index e86042980b97..cb4d5e4c999f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d50004b0867a59f8a81116f000edb352595343d9
+refs/heads/master: ed62f77bb631bc4a2d8acb0521b720cb55e58183
diff --git a/trunk/arch/cris/kernel/profile.c b/trunk/arch/cris/kernel/profile.c
index 44f7b4f79476..9aa571169bcc 100644
--- a/trunk/arch/cris/kernel/profile.c
+++ b/trunk/arch/cris/kernel/profile.c
@@ -35,19 +35,16 @@ read_cris_profile(struct file *file, char __user *buf,
 		  size_t count, loff_t *ppos)
 {
 	unsigned long p = *ppos;
+	ssize_t ret;
 
-	if (p > SAMPLE_BUFFER_SIZE)
-		return 0;
+	ret = simple_read_from_buffer(buf, count, ppos, sample_buffer,
+						SAMPLE_BUFFER_SIZE);
+	if (ret < 0)
+		return ret;
 
-	if (p + count > SAMPLE_BUFFER_SIZE)
-		count = SAMPLE_BUFFER_SIZE - p;
-	if (copy_to_user(buf, sample_buffer + p,count))
-		return -EFAULT;
+	memset(sample_buffer + p, 0, ret);
 
-	memset(sample_buffer + p, 0, count);
-	*ppos += count;
-
-	return count;
+	return ret;
 }
 
 static ssize_t