---

yaml --- r: 40082 b: refs/heads/master c: 53571ce h: refs/heads/master v: v3
git-mirror · Oct 19, 2006 · 4f09fce · 4f09fce
1 parent 389f680
commit 4f09fce
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36d98e79b798fb27e38b9be4f36c5a96025f9281
+refs/heads/master: 53571ce47010562f5e67782ea00206f379a5cd65
diff --git a/trunk/arch/mips/kernel/linux32.c b/trunk/arch/mips/kernel/linux32.c
@@ -1055,7 +1055,9 @@ asmlinkage long sys32_newuname(struct new_utsname __user * name)
 asmlinkage int sys32_personality(unsigned long personality)
 {
 	int ret;
-	if (current->personality == PER_LINUX32 && personality == PER_LINUX)
+	personality &= 0xffffffff;
+	if (personality(current->personality) == PER_LINUX32 &&
+	    personality == PER_LINUX)
 		personality = PER_LINUX32;
 	ret = sys_personality(personality);
 	if (ret == PER_LINUX32)