From 3960c8eed3c5494539146ccf960f3db0f0b5d215 Mon Sep 17 00:00:00 2001
From: Chris Dearman <chris@mips.com>
Date: Thu, 13 Dec 2007 22:42:19 +0000
Subject: [PATCH] --- yaml --- r: 74855 b: refs/heads/master c:
 bbaf238b5f910f8f3dda4b96cf844f50b2dcc6fa h: refs/heads/master i:   74853:
 9c8dc44f5e81e5dd44606d637df0b443c938782f   74851:
 9fcc51b9a452f479b1ee131742624ab29ac4b10f   74847:
 5551ffc75e6c48c84c92fc896514faaae86e22b8 v: v3

---
 [refs]                           | 2 +-
 trunk/arch/mips/kernel/process.c | 3 +--
 trunk/arch/mips/kernel/traps.c   | 6 +++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index f6b0d1a00de3..d0328b70b904 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4037500ebcfd172a15aed40caa847c52e9906712
+refs/heads/master: bbaf238b5f910f8f3dda4b96cf844f50b2dcc6fa
diff --git a/trunk/arch/mips/kernel/process.c b/trunk/arch/mips/kernel/process.c
index 11cb264f59ce..2c09a442e5e5 100644
--- a/trunk/arch/mips/kernel/process.c
+++ b/trunk/arch/mips/kernel/process.c
@@ -77,9 +77,8 @@ void start_thread(struct pt_regs * regs, unsigned long pc, unsigned long sp)
 	unsigned long status;
 
 	/* New thread loses kernel privileges. */
-	status = regs->cp0_status & ~(ST0_CU0|ST0_CU1|KU_MASK);
+	status = regs->cp0_status & ~(ST0_CU0|ST0_CU1|ST0_FR|KU_MASK);
 #ifdef CONFIG_64BIT
-	status &= ~ST0_FR;
 	status |= test_thread_flag(TIF_32BIT_REGS) ? 0 : ST0_FR;
 #endif
 	status |= KU_USER;
diff --git a/trunk/arch/mips/kernel/traps.c b/trunk/arch/mips/kernel/traps.c
index 23e73d0650a3..fcae66752972 100644
--- a/trunk/arch/mips/kernel/traps.c
+++ b/trunk/arch/mips/kernel/traps.c
@@ -1317,12 +1317,12 @@ void __init per_cpu_trap_init(void)
 #endif
 	if (current_cpu_data.isa_level == MIPS_CPU_ISA_IV)
 		status_set |= ST0_XX;
+	if (cpu_has_dsp)
+		status_set |= ST0_MX;
+
 	change_c0_status(ST0_CU|ST0_MX|ST0_RE|ST0_FR|ST0_BEV|ST0_TS|ST0_KX|ST0_SX|ST0_UX,
 			 status_set);
 
-	if (cpu_has_dsp)
-		set_c0_status(ST0_MX);
-
 #ifdef CONFIG_CPU_MIPSR2
 	if (cpu_has_mips_r2) {
 		unsigned int enable = 0x0000000f;