Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

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

diff --git a/arch/m68knommu/platform/68360/entry.S b/arch/m68knommu/platform/68360/entry.S
index c131c6e..8a28788 100644 (file)
--- a/arch/m68knommu/platform/68360/entry.S
+++ b/arch/m68knommu/platform/68360/entry.S
@@ -102,6 +102,7 @@ Luser_return:
        movel   %sp,%d1                 /* get thread_info pointer */
        andl    #-THREAD_SIZE,%d1
        movel   %d1,%a2
+1:
        move    %a2@(TI_FLAGS),%d1      /* thread_info->flags */
        andl    #_TIF_WORK_MASK,%d1
        jne     Lwork_to_do
@@ -116,13 +117,11 @@ Lsignal_return:
        subql   #4,%sp                  /* dummy return address*/
        SAVE_SWITCH_STACK
        pea     %sp@(SWITCH_STACK_SIZE)
-       clrl    %sp@-
        bsrw    do_signal
-       addql   #8,%sp
+       addql   #4,%sp
        RESTORE_SWITCH_STACK
        addql   #4,%sp
-Lreturn:
-       RESTORE_ALL
+       jra     1b
 
 /*
  * This is the main interrupt handler, responsible for calling do_IRQ()