From: Paul Mundt <lethal@linux-sh.org>
Date: Fri, 14 Aug 2009 20:58:45 +0000 (+0900)
Subject: Merge branch 'master' into sh/cachetlb
X-Git-Tag: v2.6.32-rc1~640^2~68
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d2dcd9101b1a940ce8496601ba871e47f84881ec;p=karo-tx-linux.git

Merge branch 'master' into sh/cachetlb
---

d2dcd9101b1a940ce8496601ba871e47f84881ec
diff --cc arch/sh/kernel/cpu/sh3/entry.S
index a701fac8ed42,67ad6467c694..854921c6f45b
--- a/arch/sh/kernel/cpu/sh3/entry.S
+++ b/arch/sh/kernel/cpu/sh3/entry.S
@@@ -133,10 -133,11 +133,11 @@@ ENTRY(tlb_protection_violation_load
  
  	.align	2
  ENTRY(tlb_protection_violation_store)
 -	bra	call_dpf
 +	bra	call_do_page_fault
  	 mov	#1, r5
  
 -call_dpf:
 +call_handle_tlbmiss:
+ 	setup_frame_reg
  	mov.l	1f, r0
  	mov	r5, r8
  	mov.l	@r0, r6