From 45be3d716f34bee8e3bf27b7f321c5296c9e6a82 Mon Sep 17 00:00:00 2001
From: Kumar Gala <galak@kernel.crashing.org>
Date: Fri, 17 Apr 2009 08:03:01 +0000
Subject: [PATCH] --- yaml --- r: 144261 b: refs/heads/master c:
 2e8aead1b57ede7979bd4e24797c77e181775d9c h: refs/heads/master i:   144259:
 64b3e38fc1b1be7eccdf05d8bade4296bd80e1b8 v: v3

---
 [refs]                               | 2 +-
 trunk/arch/powerpc/include/asm/elf.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d5eace8ece79..218c45be26b1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de60fba2bb5ba0622058d422ab211f3cfd38ed7b
+refs/heads/master: 2e8aead1b57ede7979bd4e24797c77e181775d9c
diff --git a/trunk/arch/powerpc/include/asm/elf.h b/trunk/arch/powerpc/include/asm/elf.h
index 087c22f1d368..d6b4a12cdeff 100644
--- a/trunk/arch/powerpc/include/asm/elf.h
+++ b/trunk/arch/powerpc/include/asm/elf.h
@@ -260,6 +260,7 @@ do {								\
 #else 
 # define SET_PERSONALITY(ex) \
   set_personality(PER_LINUX | (current->personality & (~PER_MASK)))
+# define elf_read_implies_exec(ex, exec_stk) (exec_stk != EXSTACK_DISABLE_X)
 #endif /* __powerpc64__ */
 
 extern int dcache_bsize;