diff options
author | Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> | 2010-06-07 22:00:13 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-07-02 02:48:53 -0400 |
commit | 358aa7031d90fc3c7c1dbf1fd248a7e3af3c4b11 (patch) | |
tree | 493124c41383fbd45fec08bcb5e7e8c6795f431e /arch/sh/include | |
parent | 59615ecdb516cf218c3699b02d87d9827dc3e0c7 (diff) |
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>
Diffstat (limited to 'arch/sh/include')
-rw-r--r-- | arch/sh/include/asm/system_32.h | 13 |
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, | |||
216 | 216 | ||
217 | static inline void trigger_address_error(void) | 217 | static inline void trigger_address_error(void) |
218 | { | 218 | { |
219 | if (__in_29bit_mode()) | 219 | __asm__ __volatile__ ( |
220 | __asm__ __volatile__ ( | 220 | "ldc %0, sr\n\t" |
221 | "ldc %0, sr\n\t" | 221 | "mov.l @%1, %0" |
222 | "mov.l @%1, %0" | 222 | : |
223 | : | 223 | : "r" (0x10000000), "r" (0x80000001) |
224 | : "r" (0x10000000), "r" (0x80000001) | 224 | ); |
225 | ); | ||
226 | } | 225 | } |
227 | 226 | ||
228 | asmlinkage void do_address_error(struct pt_regs *regs, | 227 | asmlinkage void do_address_error(struct pt_regs *regs, |