---

yaml --- r: 179610 b: refs/heads/master c: a7b2296 h: refs/heads/master v: v3
git-mirror · Jan 18, 2010 · 049a1f8 · 049a1f8
1 parent 7bfbcb6
commit 049a1f8
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b53e9b5ebd5c6e718f54bcacd4e97b71533ca681
+refs/heads/master: a7b22962776109b5bfe3a3efa4f42622318c547d
diff --git a/trunk/arch/arm/kernel/elf.c b/trunk/arch/arm/kernel/elf.c
@@ -78,15 +78,6 @@ int arm_elf_read_implies_exec(const struct elf32_hdr *x, int executable_stack)
 		return 1;
 	if (cpu_architecture() < CPU_ARCH_ARMv6)
 		return 1;
-#if !defined(CONFIG_AEABI) || defined(CONFIG_OABI_COMPAT)
-	/*
-	 * If we have support for OABI programs, we can never allow NX
-	 * support - our signal syscall restart mechanism relies upon
-	 * being able to execute code placed on the user stack.
-	 */
-	return 1;
-#else
 	return 0;
-#endif
 }
 EXPORT_SYMBOL(arm_elf_read_implies_exec);