From: Paul Mundt <lethal@linux-sh.org>
Date: Fri, 21 Aug 2009 20:37:14 +0000 (+0900)
Subject: Merge branch 'sh/dwarf-unwinder'
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=fa9d3b4da55fc8949efc2b4220d93f188fbcebd6;p=linux-beck.git

Merge branch 'sh/dwarf-unwinder'

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

fa9d3b4da55fc8949efc2b4220d93f188fbcebd6
diff --cc arch/sh/kernel/cpu/sh3/entry.S
index 272636ec5c98,f89ec87e3fc3..8c19e21847d7
--- a/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