git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
[sfrench/cifs-2.6.git]
/
mm
/
mremap.c
diff --git
a/mm/mremap.c
b/mm/mremap.c
index b535438c363cfb9c6d80528c2c056962ef2e038a..ddaeee9a0b69e5a5e5b232377ae97801fd6a438e 100644
(file)
--- a/
mm/mremap.c
+++ b/
mm/mremap.c
@@
-323,7
+323,7
@@
unsigned long do_mremap(unsigned long addr,
/* We can't remap across vm area boundaries */
if (old_len > vma->vm_end - addr)
goto out;
- if (vma->vm_flags &
VM_DONTEXPAND
) {
+ if (vma->vm_flags &
(VM_DONTEXPAND | VM_PFNMAP)
) {
if (new_len > old_len)
goto out;
}