projects
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 's3c-move' into devel
[linux-2.6]
/
mm
/
mmap.c
diff --git
a/mm/mmap.c
b/mm/mmap.c
index
339cf5c
..
e7a5a68
100644
(file)
--- a/
mm/mmap.c
+++ b/
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: