---

yaml --- r: 109475 b: refs/heads/master c: ce36394 h: refs/heads/master i: 109473: f077c08 109471: fe5a172 v: v3
git-mirror · Sep 4, 2008 · 8c995d7 · 8c995d7
1 parent c1e6a20
commit 8c995d7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d210baf53b699fc61aa891c177b71d7082d3b957
+refs/heads/master: ce36394269ccd9d1d286d6192ba09fa6894365e9
diff --git a/trunk/mm/mmap.c b/trunk/mm/mmap.c
@@ -1030,6 +1030,10 @@ unsigned long do_mmap_pgoff(struct file * file, unsigned long addr,
 	} else {
 		switch (flags & MAP_TYPE) {
 		case MAP_SHARED:
+			/*
+			 * Ignore pgoff.
+			 */
+			pgoff = 0;
 			vm_flags |= VM_SHARED | VM_MAYSHARE;
 			break;
 		case MAP_PRIVATE: