---

yaml --- r: 143845 b: refs/heads/master c: 59e4c3a h: refs/heads/master i: 143843: b7d594b v: v3
git-mirror · Apr 22, 2009 · f6559f4 · f6559f4
1 parent 9a74279
commit f6559f4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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;