[PATCH] updated version of VM_DATA_DEFAULT_FLAGS patch

Here is the latest version of the VM_DATA_DEFAULT_FLAGS patch
(relative to 2.5.4).

	--david

diff --git a/include/asm-alpha/page.h b/include/asm-alpha/page.h
index be8931a2e77431e43d4bac333f96384be8eeb993..4c76e87ed867234257aefaa8fed1839a0df21006 100644 (file)
--- a/include/asm-alpha/page.h
+++ b/include/asm-alpha/page.h
@@ -99,6 +99,9 @@ extern __inline__ int get_order(unsigned long size)
 #define VALID_PAGE(page)       (((page) - mem_map) < max_mapnr)
 #endif /* CONFIG_DISCONTIGMEM */
 
+#define VM_DATA_DEFAULT_FLAGS          (VM_READ | VM_WRITE | VM_EXEC | \
+                                        VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
+
 #endif /* __KERNEL__ */
 
 #endif /* _ALPHA_PAGE_H */

diff --git a/include/asm-arm/page.h b/include/asm-arm/page.h
index 40d2709c804da2b304ccf3aab8c1bf0e23023c13..f08e9fcdd70df591a39907dd56c0e407589731f7 100644 (file)
--- a/include/asm-arm/page.h
+++ b/include/asm-arm/page.h
@@ -106,6 +106,9 @@ static inline int get_order(unsigned long size)
 #define VALID_PAGE(page)       ((page - mem_map) < max_mapnr)
 #endif
 
+#define VM_DATA_DEFAULT_FLAGS  (VM_READ | VM_WRITE | VM_EXEC | \
+                                VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
+
 #endif
 
 #endif

diff --git a/include/asm-cris/page.h b/include/asm-cris/page.h
index 5950e9c1275fe71c1dc0c7f3c736b81bc9c3f08f..01166c2bfd7cdabcba08f120cd46f2fea33ebce4 100644 (file)
--- a/include/asm-cris/page.h
+++ b/include/asm-cris/page.h
@@ -118,6 +118,9 @@ typedef unsigned long pgprot_t;
 
 extern unsigned long dram_start, dram_end;
 
+#define VM_DATA_DEFAULT_FLAGS  (VM_READ | VM_WRITE | VM_EXEC | \
+                                VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
+
 #endif /* __KERNEL__ */
 
 #endif /* _CRIS_PAGE_H */

diff --git a/include/asm-i386/page.h b/include/asm-i386/page.h
index 2c53c7f50cf57b3522a1c97a4e081e0df2571147..fe30fa8abc741a4812918dbe0ffd0af9b7f8eb61 100644 (file)
--- a/include/asm-i386/page.h
+++ b/include/asm-i386/page.h
@@ -132,6 +132,9 @@ static __inline__ int get_order(unsigned long size)
 #define virt_to_page(kaddr)    (mem_map + (__pa(kaddr) >> PAGE_SHIFT))
 #define VALID_PAGE(page)       ((page - mem_map) < max_mapnr)
 
+#define VM_DATA_DEFAULT_FLAGS  (VM_READ | VM_WRITE | VM_EXEC | \
+                                VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
+
 #endif /* __KERNEL__ */
 
 #endif /* _I386_PAGE_H */

diff --git a/include/asm-ia64/page.h b/include/asm-ia64/page.h
index 2ac1b2c9b9cb6269351f2f72bb5560ee411b82e2..6594ca710cc25e6b8a167de56cdce915eaebcee1 100644 (file)
--- a/include/asm-ia64/page.h
+++ b/include/asm-ia64/page.h
@@ -148,6 +148,11 @@ get_order (unsigned long size)
 # define __pgprot(x)   (x)
 #endif /* !STRICT_MM_TYPECHECKS */
 
-#define PAGE_OFFSET            0xe000000000000000
+#define PAGE_OFFSET                    0xe000000000000000
+
+#define VM_DATA_DEFAULT_FLAGS          (VM_READ | VM_WRITE |                                   \
+                                        VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC |                \
+                                        (((current->thread.flags & IA64_THREAD_XSTACK) != 0)   \
+                                         ? VM_EXEC : 0))
 
 #endif /* _ASM_IA64_PAGE_H */

diff --git a/include/asm-m68k/page.h b/include/asm-m68k/page.h
index 40915d41c8ec9f80d82f06f481be510187e9d19f..525ae6ecc32692aa11c8a90b1a66e38ddfe899bc 100644 (file)
--- a/include/asm-m68k/page.h
+++ b/include/asm-m68k/page.h
@@ -181,6 +181,9 @@ static inline void *__va(unsigned long x)
 
 #endif /* __ASSEMBLY__ */
 
+#define VM_DATA_DEFAULT_FLAGS  (VM_READ | VM_WRITE | VM_EXEC | \
+                                VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
+
 #endif /* __KERNEL__ */
 
 #endif /* _M68K_PAGE_H */

diff --git a/include/asm-mips/page.h b/include/asm-mips/page.h
index 124a6d14240a3e21bfd30397d79cd98ac147c18c..d3fb0a1e2fde29a1bb36075d08e80d2e6722aabc 100644 (file)
--- a/include/asm-mips/page.h
+++ b/include/asm-mips/page.h
@@ -78,6 +78,9 @@ extern __inline__ int get_order(unsigned long size)
 #define virt_to_page(kaddr)    (mem_map + (__pa(kaddr) >> PAGE_SHIFT))
 #define VALID_PAGE(page)       ((page - mem_map) < max_mapnr)
 
+#define VM_DATA_DEFAULT_FLAGS  (VM_READ | VM_WRITE | VM_EXEC | \
+                                VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
+
 #endif /* defined (__KERNEL__) */
 
 #endif /* __ASM_PAGE_H */

diff --git a/include/asm-mips64/page.h b/include/asm-mips64/page.h
index 47f7d79062535d51787ca8934302ff04ad26e3d4..9046c3474d4307c5a503cf0963352781e98edbf3 100644 (file)
--- a/include/asm-mips64/page.h
+++ b/include/asm-mips64/page.h
@@ -73,6 +73,9 @@ typedef struct { unsigned long pgprot; } pgprot_t;
 #define VALID_PAGE(page)       ((page - mem_map) < max_mapnr)
 #endif
 
+#define VM_DATA_DEFAULT_FLAGS  (VM_READ | VM_WRITE | VM_EXEC | \
+                                VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
+
 #endif /* defined (__KERNEL__) */
 
 #endif /* _ASM_PAGE_H */

diff --git a/include/asm-parisc/page.h b/include/asm-parisc/page.h
index 39f19f601480898030c66f5b20f15b7c3878ccfa..73e8b5b83472573ea97eb52754ff3d91d720ed20 100644 (file)
--- a/include/asm-parisc/page.h
+++ b/include/asm-parisc/page.h
@@ -81,6 +81,9 @@ extern __inline__ int get_order(unsigned long size)
 #define        virt_to_page(kaddr)     (mem_map + (__pa(kaddr) >> PAGE_SHIFT))
 #define VALID_PAGE(page)       ((page - mem_map) < max_mapnr)
 
+#define VM_DATA_DEFAULT_FLAGS  (VM_READ | VM_WRITE | VM_EXEC | \
+                                VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
+
 #endif /* __KERNEL__ */
 
 #endif /* _PARISC_PAGE_H */

diff --git a/include/asm-ppc/page.h b/include/asm-ppc/page.h
index 3da22a960ce0b46258b4e547992da5a76c4cc7e6..6400f5e32a1a5e45fd167c678331bdbf9030298f 100644 (file)
--- a/include/asm-ppc/page.h
+++ b/include/asm-ppc/page.h
@@ -137,5 +137,9 @@ extern __inline__ int get_order(unsigned long size)
 }
 
 #endif /* __ASSEMBLY__ */
+
+#define VM_DATA_DEFAULT_FLAGS  (VM_READ | VM_WRITE | VM_EXEC | \
+                                VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
+
 #endif /* __KERNEL__ */
 #endif /* _PPC_PAGE_H */

diff --git a/include/asm-s390/page.h b/include/asm-s390/page.h
index 13d411495e2f2e3b5789b3fd1c2794b6c87f79b2..07caf4976cae4b8822ee8d11256e1c745773ef47 100644 (file)
--- a/include/asm-s390/page.h
+++ b/include/asm-s390/page.h
@@ -120,6 +120,9 @@ typedef struct { unsigned long pgprot; } pgprot_t;
 #define virt_to_page(kaddr)    (mem_map + (__pa(kaddr) >> PAGE_SHIFT))
 #define VALID_PAGE(page)       ((page - mem_map) < max_mapnr)
 
+#define VM_DATA_DEFAULT_FLAGS  (VM_READ | VM_WRITE | VM_EXEC | \
+                                VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
+
 #endif /* __KERNEL__ */
 
 #endif /* _S390_PAGE_H */

diff --git a/include/asm-s390x/page.h b/include/asm-s390x/page.h
index 6f8b67118cb4abcba4f871e48a52b74ac4ac1956..83ea9cb03c53192b65302b842fc192b63c41df0c 100644 (file)
--- a/include/asm-s390x/page.h
+++ b/include/asm-s390x/page.h
@@ -117,6 +117,9 @@ typedef struct { unsigned long pgprot; } pgprot_t;
 #define virt_to_page(kaddr)    (mem_map + (__pa(kaddr) >> PAGE_SHIFT))
 #define VALID_PAGE(page)       ((page - mem_map) < max_mapnr)
 
+#define VM_DATA_DEFAULT_FLAGS  (VM_READ | VM_WRITE | VM_EXEC | \
+                                VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
+
 #endif                                 /* __KERNEL__                       */
 
 #endif                                 /* _S390_PAGE_H                     */

diff --git a/include/asm-sparc/page.h b/include/asm-sparc/page.h
index 603a51999121b54e370b66f12288cd466cf03836..4ce13153c390f5b867570fb6155e379edb10ed9d 100644 (file)
--- a/include/asm-sparc/page.h
+++ b/include/asm-sparc/page.h
@@ -179,6 +179,9 @@ extern __inline__ int get_order(unsigned long size)
 #define virt_to_page(kaddr)    (mem_map + (__pa(kaddr) >> PAGE_SHIFT))
 #define VALID_PAGE(page)       ((page - mem_map) < max_mapnr)
 
+#define VM_DATA_DEFAULT_FLAGS  (VM_READ | VM_WRITE | VM_EXEC | \
+                                VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
+
 #endif /* __KERNEL__ */
 
 #endif /* _SPARC_PAGE_H */

diff --git a/include/asm-sparc64/page.h b/include/asm-sparc64/page.h
index c2cdb4c399e9c9affdada003f08655c1cbd7a10b..1eb1ae8cf560b6ee63ca4737e39c03fd6c332d08 100644 (file)
--- a/include/asm-sparc64/page.h
+++ b/include/asm-sparc64/page.h
@@ -153,6 +153,9 @@ extern __inline__ int get_order(unsigned long size)
 
 #endif /* !(__ASSEMBLY__) */
 
+#define VM_DATA_DEFAULT_FLAGS  (VM_READ | VM_WRITE | VM_EXEC | \
+                                VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
+
 #endif /* !(__KERNEL__) */
 
 #endif /* !(_SPARC64_PAGE_H) */

diff --git a/mm/mmap.c b/mm/mmap.c
index 9139feab7ce69f0cc816b8c280ba2edcdf23ff71..8f5662353e7a9f13c3d1d92d97e3e1e480471c37 100644 (file)
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -1046,10 +1046,7 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
        if (!vm_enough_memory(len >> PAGE_SHIFT))
                return -ENOMEM;
 
-       flags = calc_vm_flags(PROT_READ|PROT_WRITE|PROT_EXEC,
-                               MAP_FIXED|MAP_PRIVATE) | mm->def_flags;
-
-       flags |= VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC;
+       flags = VM_DATA_DEFAULT_FLAGS | mm->def_flags;
 
        /* Can we just expand an old anonymous mapping? */
        if (rb_parent && vma_merge(mm, prev, rb_parent, addr, addr + len, flags))