1 files changed, 5 insertions, 2 deletions

diff --git a/arch/m68k/platform/coldfire/entry.S b/arch/m68k/platform/coldfire/entry.S
index 3157461a8d1d..863889fc31c9 100644
--- a/arch/m68k/platform/coldfire/entry.S
+++ b/arch/m68k/platform/coldfire/entry.S
@@ -54,7 +54,6 @@ sw_usp:
 .globl ret_from_signal
 .globl sys_call_table
 .globl inthandler
-.globl fasthandler
 
 enosys:
         mov.l   #sys_ni_syscall,%d3
@@ -63,6 +62,7 @@ enosys:
 ENTRY(system_call)
         SAVE_ALL_SYS
         move    #0x2000,%sr             /* enable intrs again */
+        GET_CURRENT(%d2)
 
         cmpl    #NR_syscalls,%d0
         jcc     enosys
@@ -166,6 +166,7 @@ Lsignal_return:
  */
 ENTRY(inthandler)
         SAVE_ALL_INT
+        GET_CURRENT(%d2)
 
         movew   %sp@(PT_OFF_FORMATVEC),%d0 /* put exception # in d0 */
         andl    #0x03fc,%d0             /* mask out vector only */
@@ -191,7 +192,9 @@ ENTRY(resume)
         movel   %sp,%a0@(TASK_THREAD+THREAD_KSP) /* save kernel stack pointer */
         RDUSP                                    /* movel %usp,%a3 */
         movel   %a3,%a0@(TASK_THREAD+THREAD_USP) /* save thread user stack */
-
+#ifdef CONFIG_MMU
+        movel   %a1,%a2                          /* set new current */
+#endif
         movel   %a1@(TASK_THREAD+THREAD_USP),%a3 /* restore thread user stack */
         WRUSP                                    /* movel %a3,%usp */
         movel   %a1@(TASK_THREAD+THREAD_KSP),%sp /* restore new kernel stack */