diff options
| author | Christophe Leroy <christophe.leroy@c-s.fr> | 2016-09-05 08:42:31 +0200 |
|---|---|---|
| committer | Scott Wood <oss@buserror.net> | 2016-09-25 09:38:54 +0200 |
| commit | f307939fb260c83e6875476695ac58a669348b8f (patch) | |
| tree | 033e0db1352e0af21a5b4725b8dccc350ea86aae /arch/powerpc | |
| parent | powerpc/fsl_pci: Size upper inbound window based on RAM size (diff) | |
| download | linux-f307939fb260c83e6875476695ac58a669348b8f.tar.xz linux-f307939fb260c83e6875476695ac58a669348b8f.zip | |
powerpc/8xx: add system_reset_exception
When the watchdog is in NMI mode, the system reset interrupt is
generated when the watchdog counter expires.
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Scott Wood <oss@buserror.net>
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/kernel/head_8xx.S | 2 | ||||
| -rw-r--r-- | arch/powerpc/kernel/traps.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/head_8xx.S b/arch/powerpc/kernel/head_8xx.S index 3a185c51ce8f..f559f217cd87 100644 --- a/arch/powerpc/kernel/head_8xx.S +++ b/arch/powerpc/kernel/head_8xx.S @@ -226,7 +226,7 @@ i##n: \ ret_from_except) /* System reset */ - EXCEPTION(0x100, Reset, unknown_exception, EXC_XFER_STD) + EXCEPTION(0x100, Reset, system_reset_exception, EXC_XFER_STD) /* Machine check */ . = 0x200 diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c index 68f8b5b0d885..137b1371cce8 100644 --- a/arch/powerpc/kernel/traps.c +++ b/arch/powerpc/kernel/traps.c @@ -273,7 +273,6 @@ void _exception(int signr, struct pt_regs *regs, int code, unsigned long addr) force_sig_info(signr, &info, current); } -#ifdef CONFIG_PPC64 void system_reset_exception(struct pt_regs *regs) { /* See if any machine dependent calls */ @@ -291,6 +290,7 @@ void system_reset_exception(struct pt_regs *regs) /* What should we do here? We could issue a shutdown or hard reset. */ } +#ifdef CONFIG_PPC64 /* * This function is called in real mode. Strictly no printk's please. * |