X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=mm%2Fmmap.c;h=47556d2b3e90ddbde4b0b8e69430ef5b3726e3af;hb=fbb6b3a4ac0ccf12a97c98881d9d873d6dc26fe5;hp=11ca5927d5ff72575e2c34025a5f6e810d2ef7b4;hpb=a880b11a95fab4618da412d99fc7365d723e702d;p=linux-2.6-omap-h63xx.git

diff --git a/mm/mmap.c b/mm/mmap.c
index 11ca5927d5f..47556d2b3e9 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -13,6 +13,7 @@
 #include <linux/pagemap.h>
 #include <linux/swap.h>
 #include <linux/syscalls.h>
+#include <linux/capability.h>
 #include <linux/init.h>
 #include <linux/file.h>
 #include <linux/fs.h>
@@ -611,7 +612,7 @@ again:			remove_next = 1 + (end > next->vm_end);
  * If the vma has a ->close operation then the driver probably needs to release
  * per-vma resources, so we don't attempt to merge those.
  */
-#define VM_SPECIAL (VM_IO | VM_DONTCOPY | VM_DONTEXPAND | VM_RESERVED)
+#define VM_SPECIAL (VM_IO | VM_DONTCOPY | VM_DONTEXPAND | VM_RESERVED | VM_PFNMAP)
 
 static inline int is_mergeable_vma(struct vm_area_struct *vma,
 			struct file *file, unsigned long vm_flags)