---

yaml --- r: 322402 b: refs/heads/master c: 768fd07 h: refs/heads/master v: v3
git-mirror · Aug 30, 2012 · 4d73849 · 4d73849
1 parent 68b9137
commit 4d73849
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: 29a877fa1f402ce2c1a0c52957c4e29b9bb34216
+refs/heads/master: 768fd0737f4533635ea351566dff98fd4912b0d8
diff --git a/trunk/arch/s390/include/asm/elf.h b/trunk/arch/s390/include/asm/elf.h
@@ -180,7 +180,8 @@ extern char elf_platform[];
 #define ELF_PLATFORM (elf_platform)
 
 #ifndef CONFIG_64BIT
-#define SET_PERSONALITY(ex) set_personality(PER_LINUX)
+#define SET_PERSONALITY(ex) \
+	set_personality(PER_LINUX | (current->personality & (~PER_MASK)))
 #else /* CONFIG_64BIT */
 #define SET_PERSONALITY(ex)					\
 do {								\