From f6559f40e4a7dcefc105213fcd2d8ea95e51b998 Mon Sep 17 00:00:00 2001
From: Andreas Schwab <schwab@linux-m68k.org>
Date: Thu, 16 Apr 2009 06:22:01 +0000
Subject: [PATCH] --- yaml --- r: 143845 b: refs/heads/master c:
 59e4c3a2fe9cb1681bb2cff508ff79466f7585ba h: refs/heads/master i:   143843:
 b7d594bf83afd9bf9ae48c21e9aca873df4e1b6c v: v3

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

diff --git a/[refs] b/[refs]
index 9388836b3308..bd96536289ee 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 24f1ce803c55f645429e6a7dd94763fbace84b0a
+refs/heads/master: 59e4c3a2fe9cb1681bb2cff508ff79466f7585ba
diff --git a/trunk/arch/powerpc/include/asm/elf.h b/trunk/arch/powerpc/include/asm/elf.h
index 1a856b15226e..087c22f1d368 100644
--- a/trunk/arch/powerpc/include/asm/elf.h
+++ b/trunk/arch/powerpc/include/asm/elf.h
@@ -258,7 +258,8 @@ do {								\
 # define elf_read_implies_exec(ex, exec_stk) (test_thread_flag(TIF_32BIT) ? \
 		(exec_stk != EXSTACK_DISABLE_X) : 0)
 #else 
-# define SET_PERSONALITY(ex) set_personality(PER_LINUX)
+# define SET_PERSONALITY(ex) \
+  set_personality(PER_LINUX | (current->personality & (~PER_MASK)))
 #endif /* __powerpc64__ */
 
 extern int dcache_bsize;