---

yaml --- r: 19907 b: refs/heads/master c: 2e66fe2 h: refs/heads/master i: 19905: 941c7df 19903: 0c78e4b v: v3
git-mirror · Feb 7, 2006 · fc46773 · fc46773
1 parent 2f5541f
commit fc46773
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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)					\