From cbd3bed3df836e49e1be32cb19f81b0412391c17 Mon Sep 17 00:00:00 2001
From: Jiri Kosina <jkosina@suse.cz>
Date: Thu, 4 Oct 2012 17:12:22 -0700
Subject: [PATCH] --- yaml --- r: 330059 b: refs/heads/master c:
 9f6547a3209b78689ab8183630df87ca5e13fec0 h: refs/heads/master i:   330057:
 94837932764af2542ba5344b69dc785f00b49d76   330055:
 3dfd0b171d55a6552568f5c5e469e08916caf248 v: v3

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

diff --git a/[refs] b/[refs]
index 0f7bdb679f77..3fbcb43559f8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 16f3e95b3209c4d9080e3a3c6bb9955a0e7cfa95
+refs/heads/master: 9f6547a3209b78689ab8183630df87ca5e13fec0
diff --git a/trunk/arch/tile/include/asm/elf.h b/trunk/arch/tile/include/asm/elf.h
index d16d006d660e..f8ccf08f6934 100644
--- a/trunk/arch/tile/include/asm/elf.h
+++ b/trunk/arch/tile/include/asm/elf.h
@@ -156,12 +156,12 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
 #undef SET_PERSONALITY
 #define SET_PERSONALITY(ex) \
 do { \
-	current->personality = PER_LINUX; \
+	set_personality(PER_LINUX | (current->personality & (~PER_MASK))); \
 	current_thread_info()->status &= ~TS_COMPAT; \
 } while (0)
 #define COMPAT_SET_PERSONALITY(ex) \
 do { \
-	current->personality = PER_LINUX_32BIT; \
+	set_personality(PER_LINUX | (current->personality & (~PER_MASK))); \
 	current_thread_info()->status |= TS_COMPAT; \
 } while (0)