From b539b5f67d4836f360bfd7bcd99d205ad658fa23 Mon Sep 17 00:00:00 2001
From: Jie Zhang <jie.zhang@analog.com>
Date: Wed, 6 Jan 2010 17:23:28 +0000
Subject: [PATCH] --- yaml --- r: 178834 b: refs/heads/master c:
 7959722b951cffcd61a0a35229d007deeed8c2dd h: refs/heads/master v: v3

---
 [refs]           | 2 +-
 trunk/mm/nommu.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d3e4ace6bfc5..9a084d33bef0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cfe79c00a2f4f687eed8b7534d1d3d3d35540c29
+refs/heads/master: 7959722b951cffcd61a0a35229d007deeed8c2dd
diff --git a/trunk/mm/nommu.c b/trunk/mm/nommu.c
index a8d17521624a..17773862619b 100644
--- a/trunk/mm/nommu.c
+++ b/trunk/mm/nommu.c
@@ -1921,9 +1921,11 @@ int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, in
 
 		/* only read or write mappings where it is permitted */
 		if (write && vma->vm_flags & VM_MAYWRITE)
-			len -= copy_to_user((void *) addr, buf, len);
+			copy_to_user_page(vma, NULL, addr,
+					 (void *) addr, buf, len);
 		else if (!write && vma->vm_flags & VM_MAYREAD)
-			len -= copy_from_user(buf, (void *) addr, len);
+			copy_from_user_page(vma, NULL, addr,
+					    buf, (void *) addr, len);
 		else
 			len = 0;
 	} else {