From 4d73849a6cca9b28433e9925b8c00aa25a9e01a8 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Tue, 28 Aug 2012 10:02:08 +0200
Subject: [PATCH] --- yaml --- r: 322402 b: refs/heads/master c:
 768fd0737f4533635ea351566dff98fd4912b0d8 h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/arch/s390/include/asm/elf.h | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 08fabef51163..e3f5308d8131 100644
--- 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
index 32e8449640fa..9b94a160fe7f 100644
--- 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 {								\