diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2010-10-11 23:29:28 -0400 |
---|---|---|
committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2011-01-07 08:06:59 -0500 |
commit | d1574df7e01d427c2ed80ada11433a72907ca472 (patch) | |
tree | a2009894be6fc3c429fbec70e15cf1e0d4485a5e /arch/m68knommu/platform/68360 | |
parent | 710e91e455caf5cfec02892d667b41f312ec166c (diff) |
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>
Diffstat (limited to 'arch/m68knommu/platform/68360')
-rw-r--r-- | arch/m68knommu/platform/68360/entry.S | 4 |
1 files changed, 2 insertions, 2 deletions
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: | |||
102 | movel %sp,%d1 /* get thread_info pointer */ | 102 | movel %sp,%d1 /* get thread_info pointer */ |
103 | andl #-THREAD_SIZE,%d1 | 103 | andl #-THREAD_SIZE,%d1 |
104 | movel %d1,%a2 | 104 | movel %d1,%a2 |
105 | 1: | ||
105 | move %a2@(TI_FLAGS),%d1 /* thread_info->flags */ | 106 | move %a2@(TI_FLAGS),%d1 /* thread_info->flags */ |
106 | andl #_TIF_WORK_MASK,%d1 | 107 | andl #_TIF_WORK_MASK,%d1 |
107 | jne Lwork_to_do | 108 | jne Lwork_to_do |
@@ -120,8 +121,7 @@ Lsignal_return: | |||
120 | addql #4,%sp | 121 | addql #4,%sp |
121 | RESTORE_SWITCH_STACK | 122 | RESTORE_SWITCH_STACK |
122 | addql #4,%sp | 123 | addql #4,%sp |
123 | Lreturn: | 124 | jra 1b |
124 | RESTORE_ALL | ||
125 | 125 | ||
126 | /* | 126 | /* |
127 | * This is the main interrupt handler, responsible for calling do_IRQ() | 127 | * This is the main interrupt handler, responsible for calling do_IRQ() |