From fc46773c90adfcf697eb7a7ddd729c922d9b7c2d Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Mon, 30 Jan 2006 16:48:26 +0000
Subject: [PATCH] --- yaml --- r: 19907 b: refs/heads/master c:
 2e66fe24d6faa287088ff18051dd423a32b60502 h: refs/heads/master i:   19905:
 941c7dfbf73b79236964d93c7a308f4ac17ef47f   19903:
 0c78e4bbb8db8ff38c3175b2249e9c87f54cd872 v: v3

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

diff --git a/[refs] b/[refs]
index 4f33b3c951b1..3203887056e9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 75bdb426a16e81adcbc4c3d7f946018cd47830d1
+refs/heads/master: 2e66fe24d6faa287088ff18051dd423a32b60502
diff --git a/trunk/include/asm-mips/interrupt.h b/trunk/include/asm-mips/interrupt.h
index abdf54ee64cf..0da5818a2d62 100644
--- a/trunk/include/asm-mips/interrupt.h
+++ b/trunk/include/asm-mips/interrupt.h
@@ -114,6 +114,7 @@ __asm__ __volatile__(							\
 
 __asm__ (
 	"	.macro	local_irq_restore flags				\n"
+	"	.set	push						\n"
 	"	.set	noreorder					\n"
 	"	.set	noat						\n"
 #if defined(CONFIG_CPU_MIPSR2) && defined(CONFIG_IRQ_CPU)
@@ -141,8 +142,7 @@ __asm__ (
 	"	mtc0	\\flags, $12					\n"
 #endif
 	"	irq_disable_hazard					\n"
-	"	.set	at						\n"
-	"	.set	reorder						\n"
+	"	.set	pop						\n"
 	"	.endm							\n");
 
 #define local_irq_restore(flags)					\