diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-25 16:53:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-25 16:53:14 -0700 |
| commit | 9720d75399fd2655a6b6fb06abcf548150f22362 (patch) | |
| tree | a9c239d322420ad96afda07294d0c53295adcd3e /kernel | |
| parent | 0c63e38a129e7b1f625c6112439a4efc87b1635c (diff) | |
| parent | d92fcf0552a15891b25c343cee340d295e24109c (diff) | |
| download | linux-9720d75399fd2655a6b6fb06abcf548150f22362.tar.gz linux-9720d75399fd2655a6b6fb06abcf548150f22362.tar.bz2 linux-9720d75399fd2655a6b6fb06abcf548150f22362.zip | |
Merge branch 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc
* 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc:
signal: sys_pause() should check signal_pending()
ptrace: ptrace_resume() shouldn't wake up !TASK_TRACED thread
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/ptrace.c | 2 | ||||
| -rw-r--r-- | kernel/signal.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/kernel/ptrace.c b/kernel/ptrace.c index 7a81fc071344..2df115790cd9 100644 --- a/kernel/ptrace.c +++ b/kernel/ptrace.c @@ -562,7 +562,7 @@ static int ptrace_resume(struct task_struct *child, long request, } child->exit_code = data; - wake_up_process(child); + wake_up_state(child, __TASK_TRACED); return 0; } diff --git a/kernel/signal.c b/kernel/signal.c index ad5e818baacc..86c32b884f8e 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -3023,8 +3023,10 @@ SYSCALL_DEFINE2(signal, int, sig, __sighandler_t, handler) SYSCALL_DEFINE0(pause) { - current->state = TASK_INTERRUPTIBLE; - schedule(); + while (!signal_pending(current)) { + current->state = TASK_INTERRUPTIBLE; + schedule(); + } return -ERESTARTNOHAND; } |