diff --git a/[refs] b/[refs] index 3d7c2cef402d..42aba3400d7f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 666acb94d155106e494c6dfdd8b2fae44e0fad61 +refs/heads/master: 4570cd6a65f0559b0e11a6f953f5204fea5c719d diff --git a/trunk/Makefile b/trunk/Makefile index e7a0443c867c..5187fee78080 100644 --- a/trunk/Makefile +++ b/trunk/Makefile @@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 15 -EXTRAVERSION =-rc2 +EXTRAVERSION =-rc3 NAME=Affluent Albatross # *DOCUMENTATION* diff --git a/trunk/mm/memory.c b/trunk/mm/memory.c index 9ab206b829a2..6c1eac92a316 100644 --- a/trunk/mm/memory.c +++ b/trunk/mm/memory.c @@ -988,7 +988,7 @@ int get_user_pages(struct task_struct *tsk, struct mm_struct *mm, return i ? : -EFAULT; } if (pages) { - struct page *page = vm_normal_page(vma, start, *pte); + struct page *page = vm_normal_page(gate_vma, start, *pte); pages[i] = page; if (page) get_page(page);