fedora core 6 1.2949 + vserver 2.2.0

[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 68e5cae..aeb2e9f 100644 (file)
--- a/arch/h8300/platform/h8s/entry.S
+++ b/arch/h8300/platform/h8s/entry.S
@@ -15,7 +15,6 @@
  */
 
 #include <linux/sys.h>
-#include <linux/config.h>
 #include <asm/unistd.h>
 #include <asm/setup.h>
 #include <asm/segment.h>
@@ -244,9 +243,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 */