1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/include/asm/page.h b/arch/arm/include/asm/page.h
index cf2e2680daaa..bed1c0a00368 100644
--- a/arch/arm/include/asm/page.h
+++ b/arch/arm/include/asm/page.h
@@ -184,8 +184,9 @@ typedef struct page *pgtable_t;
 #endif /* !__ASSEMBLY__ */
-#define VM_DATA_DEFAULT_FLAGS   (VM_READ | VM_WRITE | VM_EXEC | \
+#define VM_DATA_DEFAULT_FLAGS \
-                                 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
+        (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
+         VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
 /*
 * With EABI on ARMv5 and above we must have 64-bit aligned slab pointers.

diff --git a/arch/arm/include/asm/page.h b/arch/arm/include/asm/page.h index cf2e2680daaa..bed1c0a00368 100644 --- a/arch/arm/include/asm/page.h +++ b/arch/arm/include/asm/page.h
@@ -184,8 +184,9 @@ typedef struct page *pgtable_t;
184		184
185	#endif /* !__ASSEMBLY__ */	185	#endif /* !__ASSEMBLY__ */
186		186
187	#define VM_DATA_DEFAULT_FLAGS (VM_READ \| VM_WRITE \| VM_EXEC \| \	187	#define VM_DATA_DEFAULT_FLAGS \
188	VM_MAYREAD \| VM_MAYWRITE \| VM_MAYEXEC)	188	(((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) \| \
		189	VM_READ \| VM_WRITE \| VM_MAYREAD \| VM_MAYWRITE \| VM_MAYEXEC)
189		190
190	/*	191	/*
191	* With EABI on ARMv5 and above we must have 64-bit aligned slab pointers.	192	* With EABI on ARMv5 and above we must have 64-bit aligned slab pointers.