From: Ralf Baechle <ralf@linux-mips.org>
Date: Mon, 9 Jan 2006 20:09:36 +0000 (+0000)
Subject: [MIPS] Remove stray .set mips3 resulting in 64-bit instruction in 32-bit kernels.
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4f0638ba9e3825d21d41e98d04faa6b74a05c624;p=mv-sheeva.git

[MIPS] Remove stray .set mips3 resulting in 64-bit instruction in 32-bit kernels.

Only the NMI handler was affected so this is a low impact bug.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
---

diff --git a/arch/mips/kernel/genex.S b/arch/mips/kernel/genex.S
index aa18a8b7b38..13f22d1d0e8 100644
--- a/arch/mips/kernel/genex.S
+++ b/arch/mips/kernel/genex.S
@@ -233,11 +233,11 @@ NESTED(except_vec_nmi, 0, sp)
 NESTED(nmi_handler, PT_SIZE, sp)
 	.set	push
 	.set	noat
-	.set	mips3
 	SAVE_ALL
  	move	a0, sp
 	jal	nmi_exception_handler
 	RESTORE_ALL
+	.set	mips3
 	eret
 	.set	pop
 	END(nmi_handler)