Merge branch 'dmaengine' into async-tx-next

Conflicts:
	crypto/async_tx/async_xor.c
	drivers/dma/ioat/dma_v2.h
	drivers/dma/ioat/pci.c
	drivers/md/raid5.c

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;