---

yaml --- r: 131562 b: refs/heads/master c: 9da616f h: refs/heads/master v: v3
git-mirror · Feb 19, 2009 · 3a9ec55 · 3a9ec55
1 parent 42417e1
commit 3a9ec55
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 41f3103fcfffff096c34f5267d7c9a26b44d89d3
+refs/heads/master: 9da616fb9946c8d65387052e5a538b8f54ddb292
diff --git a/trunk/arch/arm/kernel/elf.c b/trunk/arch/arm/kernel/elf.c
@@ -74,9 +74,9 @@ EXPORT_SYMBOL(elf_set_personality);
  */
 int arm_elf_read_implies_exec(const struct elf32_hdr *x, int executable_stack)
 {
-	if (executable_stack != EXSTACK_ENABLE_X)
+	if (executable_stack != EXSTACK_DISABLE_X)
 		return 1;
-	if (cpu_architecture() <= CPU_ARCH_ARMv6)
+	if (cpu_architecture() < CPU_ARCH_ARMv6)
 		return 1;
 	return 0;
 }