summaryrefslogtreecommitdiffstats
path: root/arch/i386/kernel
diff options
context:
space:
mode:
authorRoland McGrath <roland@redhat.com>2005-09-11 10:44:45 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-12 16:52:16 +0200
commitc3ff8ec31c1249d268cd11390649768a12bec1b9 (patch)
treeb9c51b7fb24baca87ddedc2134a24808aa28e1bf /arch/i386/kernel
parent[PATCH] i810fb: Update i810fb documentation (diff)
downloadlinux-c3ff8ec31c1249d268cd11390649768a12bec1b9.tar.xz
linux-c3ff8ec31c1249d268cd11390649768a12bec1b9.zip
[PATCH] i386: Don't miss pending signals returning to user mode after signal processing
Signed-off-by: Roland McGrath <roland@redhat.com> Acked-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp> Acked-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/i386/kernel')
-rw-r--r--arch/i386/kernel/entry.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/i386/kernel/entry.S b/arch/i386/kernel/entry.S
index 3aad03839660..9e24f7b207ee 100644
--- a/arch/i386/kernel/entry.S
+++ b/arch/i386/kernel/entry.S
@@ -319,7 +319,7 @@ work_notifysig: # deal with pending signals and
# vm86-space
xorl %edx, %edx
call do_notify_resume
- jmp restore_all
+ jmp resume_userspace
ALIGN
work_notifysig_v86:
@@ -329,7 +329,7 @@ work_notifysig_v86:
movl %eax, %esp
xorl %edx, %edx
call do_notify_resume
- jmp restore_all
+ jmp resume_userspace
# perform syscall exit tracing
ALIGN