From 8eadd639aa0de2fe47df9776c83a6f66cc955ba9 Mon Sep 17 00:00:00 2001
From: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Date: Thu, 16 Aug 2007 22:20:11 +0900
Subject: [PATCH] --- yaml --- r: 66142 b: refs/heads/master c:
 2f2a2d9987c4836493bfb2a80960056ef86742d2 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/arch/mips/vr41xx/common/pmu.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2aa21fd72a12..f2531380e4ba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 054c51b4368648406f487f54b7ed6ba75bbb3f8b
+refs/heads/master: 2f2a2d9987c4836493bfb2a80960056ef86742d2
diff --git a/trunk/arch/mips/vr41xx/common/pmu.c b/trunk/arch/mips/vr41xx/common/pmu.c
index e0ffbe9a9844..ba0a4f6483a2 100644
--- a/trunk/arch/mips/vr41xx/common/pmu.c
+++ b/trunk/arch/mips/vr41xx/common/pmu.c
@@ -25,6 +25,7 @@
 #include <linux/sched.h>
 #include <linux/types.h>
 
+#include <asm/cacheflush.h>
 #include <asm/cpu.h>
 #include <asm/io.h>
 #include <asm/processor.h>
@@ -70,6 +71,11 @@ static inline void software_reset(void)
 		pmu_write(PMUCNT2REG, pmucnt2);
 		break;
 	default:
+		set_c0_status(ST0_BEV | ST0_ERL);
+		change_c0_config(CONF_CM_CMASK, CONF_CM_UNCACHED);
+		flush_cache_all();
+		write_c0_wired(0);
+		__asm__("jr     %0"::"r"(0xbfc00000));
 		break;
 	}
 }
@@ -78,7 +84,6 @@ static void vr41xx_restart(char *command)
 {
 	local_irq_disable();
 	software_reset();
-	printk(KERN_NOTICE "\nYou can reset your system\n");
 	while (1) ;
 }