Merge branch 'sh/dwarf-unwinder'

Conflicts:
	arch/sh/kernel/cpu/sh3/entry.S

diff --cc arch/sh/kernel/cpu/sh3/entry.S
index 272636e,f89ec87..8c19e21
--- 1/arch/sh/kernel/cpu/sh3/entry.S
--- 2/arch/sh/kernel/cpu/sh3/entry.S
+++ b/arch/sh/kernel/cpu/sh3/entry.S
@@@ -508,14 -508,8 +508,16 @@@ ENTRY(handle_interrupt
        bsr     save_regs       ! needs original pr value in k3
         mov    #-1, k2         ! default vector kept in k2
  
+       setup_frame_reg
+ 
 +      stc     sr, r0  ! get status register
 +      shlr2   r0
 +      and     #0x3c, r0
 +      cmp/eq  #0x3c, r0
 +      bf      9f
 +      TRACE_IRQS_OFF
 +9:
 +
        ! Setup return address and jump to do_IRQ
        mov.l   4f, r9          ! fetch return address
        lds     r9, pr          ! put return address in pr