summary refs log tree commit diff
diff options
context:
space:
mode:
authorNobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>2010-06-08 02:00:13 +0000
committerPaul Mundt <lethal@linux-sh.org>2010-07-02 15:48:53 +0900
commit358aa7031d90fc3c7c1dbf1fd248a7e3af3c4b11 (patch)
tree493124c41383fbd45fec08bcb5e7e8c6795f431e
parent59615ecdb516cf218c3699b02d87d9827dc3e0c7 (diff)
downloadlinux-358aa7031d90fc3c7c1dbf1fd248a7e3af3c4b11.tar.gz
sh: Drop dependence for 29bit mode of trigger_address_error()
When CONFIG_PMB enable, ITLB is not cleared by reset of watchdog timer.
This should use trigger_address_error().

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r--arch/sh/include/asm/system_32.h13
1 files changed, 6 insertions, 7 deletions
diff --git a/arch/sh/include/asm/system_32.h b/arch/sh/include/asm/system_32.h
index 51296b36770e..9bd2684f908e 100644
--- a/arch/sh/include/asm/system_32.h
+++ b/arch/sh/include/asm/system_32.h
@@ -216,13 +216,12 @@ int handle_unaligned_access(insn_size_t instruction, struct pt_regs *regs,
 
 static inline void trigger_address_error(void)
 {
-	if (__in_29bit_mode())
-		__asm__ __volatile__ (
-			"ldc %0, sr\n\t"
-			"mov.l @%1, %0"
-			:
-			: "r" (0x10000000), "r" (0x80000001)
-		);
+	__asm__ __volatile__ (
+		"ldc %0, sr\n\t"
+		"mov.l @%1, %0"
+		:
+		: "r" (0x10000000), "r" (0x80000001)
+	);
 }
 
 asmlinkage void do_address_error(struct pt_regs *regs,