diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-01-20 02:42:52 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-01-20 02:42:52 -0500 |
commit | fbb82b03653cdb7fd1863b911e7540011259d2ce (patch) | |
tree | d5920f46068bb184a5322bc1505fb030adb6bfb6 /arch/sh/include/asm/system_32.h | |
parent | 2efa53b269ec1e9289a108e1506f53f6f1de440b (diff) |
sh: machine_ops based reboot support.
This provides a machine_ops-based reboot interface loosely cloned from
x86, and converts the native sh32 and sh64 cases over to it.
Necessary both for tying in SMP support and also enabling platforms like
SDK7786 to add support for their microcontroller-based power managers.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/include/asm/system_32.h')
-rw-r--r-- | arch/sh/include/asm/system_32.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/sh/include/asm/system_32.h b/arch/sh/include/asm/system_32.h index 06814f5b59c7..34bd2bac9a5f 100644 --- a/arch/sh/include/asm/system_32.h +++ b/arch/sh/include/asm/system_32.h | |||
@@ -2,6 +2,7 @@ | |||
2 | #define __ASM_SH_SYSTEM_32_H | 2 | #define __ASM_SH_SYSTEM_32_H |
3 | 3 | ||
4 | #include <linux/types.h> | 4 | #include <linux/types.h> |
5 | #include <asm/mmu.h> | ||
5 | 6 | ||
6 | #ifdef CONFIG_SH_DSP | 7 | #ifdef CONFIG_SH_DSP |
7 | 8 | ||
@@ -216,6 +217,17 @@ static inline reg_size_t register_align(void *val) | |||
216 | int handle_unaligned_access(insn_size_t instruction, struct pt_regs *regs, | 217 | int handle_unaligned_access(insn_size_t instruction, struct pt_regs *regs, |
217 | struct mem_access *ma, int); | 218 | struct mem_access *ma, int); |
218 | 219 | ||
220 | static inline void trigger_address_error(void) | ||
221 | { | ||
222 | if (__in_29bit_mode()) | ||
223 | __asm__ __volatile__ ( | ||
224 | "ldc %0, sr\n\t" | ||
225 | "mov.l @%1, %0" | ||
226 | : | ||
227 | : "r" (0x10000000), "r" (0x80000001) | ||
228 | ); | ||
229 | } | ||
230 | |||
219 | asmlinkage void do_address_error(struct pt_regs *regs, | 231 | asmlinkage void do_address_error(struct pt_regs *regs, |
220 | unsigned long writeaccess, | 232 | unsigned long writeaccess, |
221 | unsigned long address); | 233 | unsigned long address); |