Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

[pandora-kernel.git] / arch / m68knommu / platform / coldfire / entry.S

diff --git a/arch/m68knommu/platform/coldfire/entry.S b/arch/m68knommu/platform/coldfire/entry.S
index f90e617..4ddfc3d 100644 (file)
--- a/arch/m68knommu/platform/coldfire/entry.S
+++ b/arch/m68knommu/platform/coldfire/entry.S
@@ -156,12 +156,11 @@ Lsignal_return:
        subql   #4,%sp                  /* dummy return address */
        SAVE_SWITCH_STACK
        pea     %sp@(SWITCH_STACK_SIZE)
-       clrl    %sp@-
        jsr     do_signal
-       addql   #8,%sp
+       addql   #4,%sp
        RESTORE_SWITCH_STACK
        addql   #4,%sp
-       jmp     Lreturn
+       jmp     Luser_return
 
 /*
  * This is the generic interrupt handler (for all hardware interrupt