From: Thiemo Seufer <ths@networkno.de>
Date: Fri, 2 Sep 2005 09:56:12 +0000 (+0000)
Subject: More .set push/pop.
X-Git-Tag: MMI-PSA29.97-13-9~54848^2~1^2~86
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d8748a3abf1f388438ba2d812c1f46c549856afe;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

More .set push/pop.

Signed-off-by: Thiemo Seufer <ths@networkno.de>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
---

diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c
index 18247a7bf335..15a60c7e1a70 100644
--- a/arch/mips/mm/c-r4k.c
+++ b/arch/mips/mm/c-r4k.c
@@ -773,6 +773,7 @@ static inline void rm7k_erratum31(void)
 
 	for (addr = INDEX_BASE; addr <= INDEX_BASE + 4096; addr += ic_lsize) {
 		__asm__ __volatile__ (
+			".set push\n\t"
 			".set noreorder\n\t"
 			".set mips3\n\t"
 			"cache\t%1, 0(%0)\n\t"
@@ -787,8 +788,7 @@ static inline void rm7k_erratum31(void)
 			"cache\t%1, 0x1000(%0)\n\t"
 			"cache\t%1, 0x2000(%0)\n\t"
 			"cache\t%1, 0x3000(%0)\n\t"
-			".set\tmips0\n\t"
-			".set\treorder\n\t"
+			".set pop\n"
 			:
 			: "r" (addr), "i" (Index_Store_Tag_I), "i" (Fill));
 	}