diff options
| author | Richard Weinberger <richard@nod.at> | 2014-07-20 12:56:34 +0200 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2014-07-20 12:56:34 +0200 |
| commit | ae5db6d12341684913a78b6537c0b9c22c999b5c (patch) | |
| tree | c3ef7fd6aac9654dc774b5c72c3ed21815d3a705 /arch/um | |
| parent | Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux... (diff) | |
| download | linux-ae5db6d12341684913a78b6537c0b9c22c999b5c.tar.xz linux-ae5db6d12341684913a78b6537c0b9c22c999b5c.zip | |
Revert "um: Fix wait_stub_done() error handling"
This reverts commit 0974a9cadc7886f7baaa458bb0c89f5c5f9d458e.
The real for for that issue is to release current->mm->mmap_sem in
fix_range_common().
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/um')
| -rw-r--r-- | arch/um/os-Linux/skas/process.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/um/os-Linux/skas/process.c b/arch/um/os-Linux/skas/process.c index d531879a4617..908579f2b0ab 100644 --- a/arch/um/os-Linux/skas/process.c +++ b/arch/um/os-Linux/skas/process.c @@ -54,7 +54,7 @@ static int ptrace_dump_regs(int pid) void wait_stub_done(int pid) { - int n, status, err, bad_stop = 0; + int n, status, err; while (1) { CATCH_EINTR(n = waitpid(pid, &status, WUNTRACED | __WALL)); @@ -74,8 +74,6 @@ void wait_stub_done(int pid) if (((1 << WSTOPSIG(status)) & STUB_DONE_MASK) != 0) return; - else - bad_stop = 1; bad_wait: err = ptrace_dump_regs(pid); @@ -85,10 +83,7 @@ bad_wait: printk(UM_KERN_ERR "wait_stub_done : failed to wait for SIGTRAP, " "pid = %d, n = %d, errno = %d, status = 0x%x\n", pid, n, errno, status); - if (bad_stop) - kill(pid, SIGKILL); - else - fatal_sigsegv(); + fatal_sigsegv(); } extern unsigned long current_stub_stack(void); |