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
[PATCH] pdflush: handle resume wakeups
[sfrench/cifs-2.6.git]
/
mm
/
mremap.c
diff --git
a/mm/mremap.c
b/mm/mremap.c
index b535438c363cfb9c6d80528c2c056962ef2e038a..1903bdf65e428d88e5bf124243d99ee7ab7c51e3 100644
(file)
--- a/
mm/mremap.c
+++ b/
mm/mremap.c
@@
-13,6
+13,7
@@
#include <linux/shm.h>
#include <linux/mman.h>
#include <linux/swap.h>
#include <linux/shm.h>
#include <linux/mman.h>
#include <linux/swap.h>
+#include <linux/capability.h>
#include <linux/fs.h>
#include <linux/highmem.h>
#include <linux/security.h>
#include <linux/fs.h>
#include <linux/highmem.h>
#include <linux/security.h>
@@
-323,7
+324,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;
/* 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;
}
if (new_len > old_len)
goto out;
}