From 3a9ec5503b4349f6a318101986caefe18deed024 Mon Sep 17 00:00:00 2001
From: Makito SHIOKAWA <lkhmkt@gmail.com>
Date: Thu, 19 Feb 2009 15:34:59 +0100
Subject: [PATCH] --- yaml --- r: 131562 b: refs/heads/master c:
 9da616fb9946c8d65387052e5a538b8f54ddb292 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/arch/arm/kernel/elf.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 0935fc6887bb..153d275e5854 100644
--- 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
index 84849098c8e8..d4a0da1e48f4 100644
--- 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;
 }