---

yaml --- r: 322279 b: refs/heads/master c: 7256a5d h: refs/heads/master i: 322277: 9e1d166 322275: 53cb45d 322271: 41b73a1 v: v3
git-mirror · Aug 24, 2012 · 6bf4bc6 · 6bf4bc6
1 parent e65afbe
commit 6bf4bc6
Show file tree

Hide file tree

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