From 8c995d70e3f4d691492144b0f765a72b06121fa5 Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Wed, 3 Sep 2008 16:09:47 +0200
Subject: [PATCH] --- yaml --- r: 109475 b: refs/heads/master c:
 ce36394269ccd9d1d286d6192ba09fa6894365e9 h: refs/heads/master i:   109473:
 f077c08aced12faa1f21fbb73284fca8f11a3c85   109471:
 fe5a172bc7ed9b7f3f50a5f2bdd7111d5e032dea v: v3

---
 [refs]          | 2 +-
 trunk/mm/mmap.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 7f8de3ebb0e1..dc64ed94739f 100644
--- 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
index 339cf5c4d5d8..e7a5a68a9c2e 100644
--- 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: