diff --git a/[refs] b/[refs] index 85669139d606..add444df5ae5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5171b100511513bc52875055f7d900fc3f7c922b +refs/heads/master: abd0a782359717ded8f663bc5b8e5e9e3cc4f5e7 diff --git a/trunk/arch/m32r/kernel/entry.S b/trunk/arch/m32r/kernel/entry.S index 07d95a4f51a2..4b3a7742fe47 100644 --- a/trunk/arch/m32r/kernel/entry.S +++ b/trunk/arch/m32r/kernel/entry.S @@ -333,7 +333,7 @@ ENTRY(ei_handler) .fillinsn 1: addi sp, #4 - bra ret_to_intr + bra restore_all .fillinsn 2: srli r0, #2 @@ -382,7 +382,6 @@ check_end: pop r14 seth r0, #shigh(M32R_ICU_IMASK_ADDR) st r14, @(low(M32R_ICU_IMASK_ADDR),r0) -ret_to_intr: bra ret_from_intr /*