Merge branch 'master' into sh/cachetlb

diff --cc arch/sh/kernel/cpu/sh3/entry.S
index a701fac8ed42c3806e9ab1a05f721c3076578b69,67ad6467c694b43cfca77b28bd96ee9a3648c5a8..854921c6f45b676986a5b9aaaf801bc736c95e13
--- 1/arch/sh/kernel/cpu/sh3/entry.S
--- 2/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