m68knommu: Handle multiple pending signals

we shouldn't bugger off to userland when there still are
pending signals; among other things it makes e.g. SIGSEGV
triggered by failure to build a sigframe to be delivered
_now_ and not when we hit the next syscall or interrupt.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Acked-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>

3 files changed, 5 insertions, 5 deletions

diff --git a/arch/m68knommu/platform/68328/entry.S b/arch/m68knommu/platform/68328/entry.S
index 6eeb635fab7e..240a7a6e25c8 100644
--- a/arch/m68knommu/platform/68328/entry.S
+++ b/arch/m68knommu/platform/68328/entry.S
@@ -106,6 +106,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
@@ -124,8 +125,7 @@ Lsignal_return:
         addql   #4,%sp
         RESTORE_SWITCH_STACK
         addql   #4,%sp
-Lreturn:
-        RESTORE_ALL
+        jra     1b
 
 /*
  * This is the main interrupt handler, responsible for calling process_int()
diff --git a/arch/m68knommu/platform/68360/entry.S b/arch/m68knommu/platform/68360/entry.S
index 2a671da4af6f..8a28788c0eea 100644
--- 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
@@ -120,8 +121,7 @@ Lsignal_return:
         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()
diff --git a/arch/m68knommu/platform/coldfire/entry.S b/arch/m68knommu/platform/coldfire/entry.S
index ed2878829dbd..e1debc8285ef 100644
--- a/arch/m68knommu/platform/coldfire/entry.S
+++ b/arch/m68knommu/platform/coldfire/entry.S
@@ -171,7 +171,7 @@ Lsignal_return:
         addql   #4,%sp
         RESTORE_SWITCH_STACK
         addql   #4,%sp
-        jmp     Lreturn
+        jmp     Luser_return
 
 /*
  * This is the generic interrupt handler (for all hardware interrupt