Update from upstream with manual merge of Yasunori Goto's

changes to swiotlb.c made in commit 281dd25cdc0d6903929b79183816d151ea626341
since this file has been moved from arch/ia64/lib/swiotlb.c to
lib/swiotlb.c

Signed-off-by: Tony Luck <tony.luck@intel.com>

1 files changed, 9 insertions, 0 deletions

diff --git a/arch/m32r/kernel/entry.S b/arch/m32r/kernel/entry.S
index dddbf6b5ed2c..85920fb8d08c 100644
--- a/arch/m32r/kernel/entry.S
+++ b/arch/m32r/kernel/entry.S
@@ -681,6 +681,15 @@ ENTRY(debug_trap)
         bl      do_debug_trap
         bra     error_code
 
+ENTRY(ill_trap)
+        /* void ill_trap(void) */
+        SWITCH_TO_KERNEL_STACK
+        SAVE_ALL
+        ldi     r1, #0                          ; error_code ; FIXME
+        mv      r0, sp                          ; pt_regs
+        bl      do_ill_trap
+        bra     error_code
+
 
 /* Cache flushing handler */
 ENTRY(cache_flushing_handler)