From 6bf4bc64938d152d35728ef368c6d905c8c18949 Mon Sep 17 00:00:00 2001
From: Jiri Kosina <jkosina@suse.cz>
Date: Mon, 13 Aug 2012 03:18:28 +0000
Subject: [PATCH] --- yaml --- r: 322279 b: refs/heads/master c:
 7256a5d2da56f2ea8ad49e8dbe9e2984f0899b42 h: refs/heads/master i:   322277:
 9e1d16614c96b9ec6eafeda2059944d3c0ec76d8   322275:
 53cb45d3ac2fa29e00355b55de3c65f68ec98c4e   322271:
 41b73a17b33970f9f36033d88c8c1cf4773e9536 v: v3

---
 [refs]                               | 2 +-
 trunk/arch/powerpc/kernel/syscalls.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 3e609a5c5e0b..9291bfbe4d2c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c374af5fdee4bc6b4f5ea96c1a0f0ad7d3566be
+refs/heads/master: 7256a5d2da56f2ea8ad49e8dbe9e2984f0899b42
diff --git a/trunk/arch/powerpc/kernel/syscalls.c b/trunk/arch/powerpc/kernel/syscalls.c
index f2496f2faecc..4e3cc47f26b9 100644
--- a/trunk/arch/powerpc/kernel/syscalls.c
+++ b/trunk/arch/powerpc/kernel/syscalls.c
@@ -107,11 +107,11 @@ long ppc64_personality(unsigned long personality)
 	long ret;
 
 	if (personality(current->personality) == PER_LINUX32
-	    && personality == PER_LINUX)
-		personality = PER_LINUX32;
+	    && personality(personality) == PER_LINUX)
+		personality = (personality & ~PER_MASK) | PER_LINUX32;
 	ret = sys_personality(personality);
-	if (ret == PER_LINUX32)
-		ret = PER_LINUX;
+	if (personality(ret) == PER_LINUX32)
+		ret = (ret & ~PER_MASK) | PER_LINUX;
 	return ret;
 }
 #endif