Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

[linux-2.6.git] / arch / h8300 / platform / h8s / entry.S

diff --git a/arch/h8300/platform/h8s/entry.S b/arch/h8300/platform/h8s/entry.S
index 9df1201..a7a53c8 100644 (file)
--- a/arch/h8300/platform/h8s/entry.S
+++ b/arch/h8300/platform/h8s/entry.S
@@ -83,6 +83,7 @@
        mov.l   @(LER0-LER1:16,sp),er1          /* restore ER0 */
        mov.l   er1,@er0
        mov.w   @(LEXR-LER1:16,sp),r1           /* restore EXR */
+       mov.b   r1l,r1h
        mov.w   r1,@(8:16,er0)
        mov.w   @(LCCR-LER1:16,sp),r1           /* restore the RET addr */
        mov.b   r1l,r1h
@@ -214,7 +215,6 @@ SYMBOL_NAME_LABEL(system_call)
        jsr     @SYMBOL_NAME(syscall_trace)
        bra     SYMBOL_NAME(ret_from_exception):8
 
-
 SYMBOL_NAME_LABEL(ret_from_fork)
        mov.l   er2,er0
        jsr     @SYMBOL_NAME(schedule_tail)
@@ -244,9 +244,9 @@ SYMBOL_NAME_LABEL(ret_from_interrupt)
        mov.l   @(TI_FLAGS:16,er4),er1
        btst    #TIF_NEED_RESCHED,r1l
        bne     SYMBOL_NAME(reschedule):16
-       mov.l   sp,er1
-       subs    #4,er1                  /* adjust retpc */
-       mov.l   er2,er0
+       mov.l   sp,er0
+       subs    #4,er0                  /* adjust retpc */
+       mov.l   er2,er1
        jsr     @SYMBOL_NAME(do_signal)
 #if defined(CONFIG_PREEMPT)
        bra     done:8                  /* userspace thoru */