commit 4570cd6a65f0559b0e11a6f953f5204fea5c719d
author Linus Torvalds <torvalds@g5.osdl.org> Tue Nov 29 08:05:54 2005 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> Tue Nov 29 08:05:54 2005 -0800
tree b09ce26ab076decded3d7a6d6b1693ac3bdb103f
parent fa2a455b028f3b6ca4dae129c6337d7edf21f12c
parent 666acb94d155106e494c6dfdd8b2fae44e0fad61

Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge

Makefile

diff --git a/Makefile b/Makefile
index e7a0443..5187fee 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 15
-EXTRAVERSION =-rc2
+EXTRAVERSION =-rc3
 NAME=Affluent Albatross
 
 # *DOCUMENTATION*

mm/memory.c

diff --git a/mm/memory.c b/mm/memory.c
index 9ab206b..6c1eac9 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -988,7 +988,7 @@
 				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);