X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=mm%2Fmremap.c;h=1903bdf65e428d88e5bf124243d99ee7ab7c51e3;hb=d616e09ab33aa4d013a93c9b393efd5cebf78521;hp=b535438c363cfb9c6d80528c2c056962ef2e038a;hpb=87199134b4a85de56a7508c551ab3b3a3ee35035;p=sfrench%2Fcifs-2.6.git

diff --git a/mm/mremap.c b/mm/mremap.c
index b535438c363c..1903bdf65e42 100644
--- 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/capability.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;
-	if (vma->vm_flags & VM_DONTEXPAND) {
+	if (vma->vm_flags & (VM_DONTEXPAND | VM_PFNMAP)) {
 		if (new_len > old_len)
 			goto out;
 	}