From 95b476af51e9d3cb7fdff5caaff9c0b20986166c Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Thu, 25 Mar 2010 16:48:44 +0000
Subject: [PATCH] --- yaml --- r: 189061 b: refs/heads/master c:
 e1ee65d85904c5dd4b9cea1b15d5e85e20eae8a1 h: refs/heads/master i:   189059:
 05838cdfc3f6ac4e15c281bb2aa918abab5f6317 v: v3

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

diff --git a/[refs] b/[refs]
index 9c5824a7e3bf..1bed649b04a5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7561e8ca0dfaf6fca3feef982830de3b65300e5b
+refs/heads/master: e1ee65d85904c5dd4b9cea1b15d5e85e20eae8a1
diff --git a/trunk/mm/nommu.c b/trunk/mm/nommu.c
index 089982f5a4cf..63fa17d121f0 100644
--- a/trunk/mm/nommu.c
+++ b/trunk/mm/nommu.c
@@ -162,7 +162,7 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
 		}
 		if (vmas)
 			vmas[i] = vma;
-		start += PAGE_SIZE;
+		start = (start + PAGE_SIZE) & PAGE_MASK;
 	}
 
 	return i;