From 03c2f5fa15c8fbe686bf00d4904c776f671cf438 Mon Sep 17 00:00:00 2001
From: Kyle McMartin <kyle@parisc-linux.org>
Date: Sun, 27 Aug 2006 11:04:26 -0400
Subject: [PATCH] --- yaml --- r: 38519 b: refs/heads/master c:
 df570b9c284701d08b22aa00cbfcf870b7f1b7c1 h: refs/heads/master i:   38517:
 7bde49b764bbafb79fe76785f7e5c3d78073c9fe   38515:
 6bcc2f599a81ee9e9f84d95fc343986d06ba3fac   38511:
 3ccad67f7a8997dd3cedbc9296c24d3b94be4186 v: v3

---
 [refs]                                  |  2 +-
 trunk/arch/parisc/kernel/binfmt_elf32.c | 24 +-----------------------
 trunk/arch/parisc/kernel/signal.c       |  5 ++---
 trunk/include/asm-parisc/compat.h       |  4 ++--
 trunk/include/asm-parisc/processor.h    |  2 +-
 5 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/[refs] b/[refs]
index f1f43a35d249..c654d0a16013 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8f611c453c6a41eee73645c80ccb10493e74b630
+refs/heads/master: df570b9c284701d08b22aa00cbfcf870b7f1b7c1
diff --git a/trunk/arch/parisc/kernel/binfmt_elf32.c b/trunk/arch/parisc/kernel/binfmt_elf32.c
index d1833f164bbe..1e64e7b88110 100644
--- a/trunk/arch/parisc/kernel/binfmt_elf32.c
+++ b/trunk/arch/parisc/kernel/binfmt_elf32.c
@@ -87,7 +87,7 @@ struct elf_prpsinfo32
  */
 
 #define SET_PERSONALITY(ex, ibcs2) \
-	current->personality = PER_LINUX32; \
+	set_thread_flag(TIF_32BIT); \
 	current->thread.map_base = DEFAULT_MAP_BASE32; \
 	current->thread.task_size = DEFAULT_TASK_SIZE32 \
 
@@ -102,25 +102,3 @@ cputime_to_compat_timeval(const cputime_t cputime, struct compat_timeval *value)
 }
 
 #include "../../../fs/binfmt_elf.c"
-
-/* Set up a separate execution domain for ELF32 binaries running
- * on an ELF64 kernel */
-
-static struct exec_domain parisc32_exec_domain = { 
-	.name = "Linux/ELF32",
-	.pers_low = PER_LINUX32,
-	.pers_high = PER_LINUX32,
-};      
-
-static int __init parisc32_exec_init(void)
-{
-	/* steal the identity signal mappings from the default domain */
-	parisc32_exec_domain.signal_map = default_exec_domain.signal_map;
-	parisc32_exec_domain.signal_invmap = default_exec_domain.signal_invmap;
-
-	register_exec_domain(&parisc32_exec_domain);
-
-	return 0;
-}
-
-__initcall(parisc32_exec_init);
diff --git a/trunk/arch/parisc/kernel/signal.c b/trunk/arch/parisc/kernel/signal.c
index bb83880c5ee3..ee6653edeb7a 100644
--- a/trunk/arch/parisc/kernel/signal.c
+++ b/trunk/arch/parisc/kernel/signal.c
@@ -26,7 +26,6 @@
 #include <linux/stddef.h>
 #include <linux/compat.h>
 #include <linux/elf.h>
-#include <linux/personality.h>
 #include <asm/ucontext.h>
 #include <asm/rt_sigframe.h>
 #include <asm/uaccess.h>
@@ -433,13 +432,13 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
 	if (in_syscall) {
 		regs->gr[31] = haddr;
 #ifdef __LP64__
-		if (personality(current->personality) == PER_LINUX)
+		if (!test_thread_flag(TIF_32BIT))
 			sigframe_size |= 1;
 #endif
 	} else {
 		unsigned long psw = USER_PSW;
 #ifdef __LP64__
-		if (personality(current->personality) == PER_LINUX)
+		if (!test_thread_flag(TIF_32BIT))
 			psw |= PSW_W;
 #endif
 
diff --git a/trunk/include/asm-parisc/compat.h b/trunk/include/asm-parisc/compat.h
index 71b4eeea205a..fe8579023531 100644
--- a/trunk/include/asm-parisc/compat.h
+++ b/trunk/include/asm-parisc/compat.h
@@ -5,7 +5,7 @@
  */
 #include <linux/types.h>
 #include <linux/sched.h>
-#include <linux/personality.h>
+#include <linux/thread_info.h>
 
 #define COMPAT_USER_HZ 100
 
@@ -152,7 +152,7 @@ static __inline__ void __user *compat_alloc_user_space(long len)
 
 static inline int __is_compat_task(struct task_struct *t)
 {
-	return personality(t->personality) == PER_LINUX32;
+	return test_ti_thread_flag(t->thread_info, TIF_32BIT);
 }
 
 static inline int is_compat_task(void)
diff --git a/trunk/include/asm-parisc/processor.h b/trunk/include/asm-parisc/processor.h
index 4313618c98ee..fd7866dc8c83 100644
--- a/trunk/include/asm-parisc/processor.h
+++ b/trunk/include/asm-parisc/processor.h
@@ -278,7 +278,7 @@ on downward growing arches, it looks like this:
  */
 
 #ifdef __LP64__
-#define USER_WIDE_MODE	(personality(current->personality) == PER_LINUX)
+#define USER_WIDE_MODE	(!test_thread_flag(TIF_32BIT))
 #else
 #define USER_WIDE_MODE	0
 #endif