diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-13 13:18:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-13 13:18:32 -0700 |
| commit | 84c48e6f43ae1771fc67fd8fcd777ff4b3b4465b (patch) | |
| tree | 3272373e763d8e3ba5f7d7b0a7e18cd16eb178a8 /arch/avr32/kernel | |
| parent | 5c55b40b27bc3249358dcfc86c0845be409ab7a6 (diff) | |
| parent | bb6e647051a59dca5a72b3deef1e061d7c1c34da (diff) | |
| download | linux-84c48e6f43ae1771fc67fd8fcd777ff4b3b4465b.tar.gz linux-84c48e6f43ae1771fc67fd8fcd777ff4b3b4465b.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6:
avr32: Fix oops on unaligned user access
avr32: Add support for Mediama RMTx add-on board for ATNGW100
avr32: Change Atmel ATNGW100 config to add choice of add-on board
Fix MIMC200 board LCD init
avr32: Fix clash in ATMEL_USART_ flags
avr32: remove obsolete hw_interrupt_type
avr32: Solves problem with inverted MCI detect pin on Merisc board
atmel-mci: Add support for inverted detect pin
Diffstat (limited to 'arch/avr32/kernel')
| -rw-r--r-- | arch/avr32/kernel/traps.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/arch/avr32/kernel/traps.c b/arch/avr32/kernel/traps.c index d547c8df157d..6e3d491184ea 100644 --- a/arch/avr32/kernel/traps.c +++ b/arch/avr32/kernel/traps.c @@ -75,8 +75,17 @@ void _exception(long signr, struct pt_regs *regs, int code, { siginfo_t info; - if (!user_mode(regs)) + if (!user_mode(regs)) { + const struct exception_table_entry *fixup; + + /* Are we prepared to handle this kernel fault? */ + fixup = search_exception_tables(regs->pc); + if (fixup) { + regs->pc = fixup->fixup; + return; + } die("Unhandled exception in kernel mode", regs, signr); + } memset(&info, 0, sizeof(info)); info.si_signo = signr; |