Merge branch 'ptp-virtual-clocks-and-timestamping'

[linux-2.6-microblaze.git] / mm / nommu.c

diff --git a/mm/nommu.c b/mm/nommu.c
index 85a3a68..affda71 100644 (file)
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -1296,7 +1296,7 @@ unsigned long ksys_mmap_pgoff(unsigned long addr, unsigned long len,
                        goto out;
        }
 
-       flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
+       flags &= ~MAP_DENYWRITE;
 
        retval = vm_mmap_pgoff(file, addr, len, prot, flags, pgoff);