---

yaml --- r: 375939 b: refs/heads/master c: f91a148 h: refs/heads/master i: 375937: 5a94f90 375935: 15dea30 v: v3
git-mirror · May 21, 2013 · 6224679 · 6224679
1 parent 55471a6
commit 6224679
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 19 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 00baf8576c29c93a470bdfc98a5c121a49c2f34b
+refs/heads/master: f91a148aa22b3808c12525ccc5779ff0ae6314a4
diff --git a/trunk/arch/mips/kernel/idle.c b/trunk/arch/mips/kernel/idle.c
@@ -57,13 +57,15 @@ void r4k_wait_irqoff(void)
 {
 	local_irq_disable();
 	if (!need_resched())
-		__asm__("	.set	push		\n"
-			"	.set	mips3		\n"
-			"	wait			\n"
-			"	.set	pop		\n");
+		__asm__(
+		"	.set	push		\n"
+		"	.set	mips3		\n"
+		"	wait			\n"
+		"	.set	pop		\n");
 	local_irq_enable();
-	__asm__("	.globl __pastwait	\n"
-		"__pastwait:			\n");
+	__asm__(
+	"	.globl __pastwait	\n"
+	"__pastwait:			\n");
 }
 
 /*
@@ -94,18 +96,19 @@ static void rm7k_wait_irqoff(void)
  */
 static void au1k_wait(void)
 {
-	__asm__("	.set	mips3			\n"
-		"	cache	0x14, 0(%0)		\n"
-		"	cache	0x14, 32(%0)		\n"
-		"	sync				\n"
-		"	nop				\n"
-		"	wait				\n"
-		"	nop				\n"
-		"	nop				\n"
-		"	nop				\n"
-		"	nop				\n"
-		"	.set	mips0			\n"
-		: : "r" (au1k_wait));
+	__asm__(
+	"	.set	mips3			\n"
+	"	cache	0x14, 0(%0)		\n"
+	"	cache	0x14, 32(%0)		\n"
+	"	sync				\n"
+	"	nop				\n"
+	"	wait				\n"
+	"	nop				\n"
+	"	nop				\n"
+	"	nop				\n"
+	"	nop				\n"
+	"	.set	mips0			\n"
+	: : "r" (au1k_wait));
 }
 
 static int __initdata nowait;