From 6d5138a1c5112c51511ea5d136f77b4a22fd9835 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Tue, 3 Aug 2010 03:42:32 +0100
Subject: [PATCH] --- yaml --- r: 204474 b: refs/heads/master c:
 36f217d9df3e6bf8e6ae7647827b485b79dbaf8e h: refs/heads/master v: v3

---
 [refs]                                                 | 2 +-
 trunk/arch/mips/alchemy/devboards/pb1000/board_setup.c | 5 ++++-
 trunk/arch/mips/alchemy/mtx-1/board_setup.c            | 5 ++++-
 trunk/arch/mips/alchemy/xxs1500/board_setup.c          | 5 ++++-
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 7f84ff962176..3b1ff304d171 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 220937b1aa97025a0e2fff0604b00ee6e9b7ccd3
+refs/heads/master: 36f217d9df3e6bf8e6ae7647827b485b79dbaf8e
diff --git a/trunk/arch/mips/alchemy/devboards/pb1000/board_setup.c b/trunk/arch/mips/alchemy/devboards/pb1000/board_setup.c
index 4ef50d86b181..46fdc8c9b99f 100644
--- a/trunk/arch/mips/alchemy/devboards/pb1000/board_setup.c
+++ b/trunk/arch/mips/alchemy/devboards/pb1000/board_setup.c
@@ -49,7 +49,10 @@ static void board_power_off(void)
 {
 	printk(KERN_ALERT "It's now safe to remove power\n");
 	while (1)
-		asm volatile (".set mips3 ; wait ; .set mips1");
+		asm volatile (
+		"	.set	mips32					\n"
+		"	wait						\n"
+		"	.set	mips0					\n");
 }
 
 void __init board_setup(void)
diff --git a/trunk/arch/mips/alchemy/mtx-1/board_setup.c b/trunk/arch/mips/alchemy/mtx-1/board_setup.c
index 52d883d37dd7..def1a75d7561 100644
--- a/trunk/arch/mips/alchemy/mtx-1/board_setup.c
+++ b/trunk/arch/mips/alchemy/mtx-1/board_setup.c
@@ -62,7 +62,10 @@ static void mtx1_power_off(void)
 {
 	printk(KERN_ALERT "It's now safe to remove power\n");
 	while (1)
-		asm volatile (".set mips3 ; wait ; .set mips1");
+		asm volatile (
+		"	.set	mips32					\n"
+		"	wait						\n"
+		"	.set	mips0					\n");
 }
 
 void __init board_setup(void)
diff --git a/trunk/arch/mips/alchemy/xxs1500/board_setup.c b/trunk/arch/mips/alchemy/xxs1500/board_setup.c
index 47b42927607b..7868aeab2453 100644
--- a/trunk/arch/mips/alchemy/xxs1500/board_setup.c
+++ b/trunk/arch/mips/alchemy/xxs1500/board_setup.c
@@ -44,7 +44,10 @@ static void xxs1500_power_off(void)
 {
 	printk(KERN_ALERT "It's now safe to remove power\n");
 	while (1)
-		asm volatile (".set mips3 ; wait ; .set mips1");
+		asm volatile (
+		"	.set	mips32					\n"
+		"	wait						\n"
+		"	.set	mips0					\n");
 }
 
 void __init board_setup(void)