projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
V4L/DVB (3200): Fix saa7134 ALSA/OSS collisions
[powerpc.git]
/
mm
/
mremap.c
diff --git
a/mm/mremap.c
b/mm/mremap.c
index
b535438
..
ddaeee9
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;
}