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;