diff options
author | Davidlohr Bueso <dave@stgolabs.net> | 2015-02-17 16:45:41 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-17 17:34:51 -0500 |
commit | 1df0135588ed4e6048c1608ec046e9a38ea91e8e (patch) | |
tree | e04e2f8d3fcf080c2ec6d6a1430f2045f5df869d /kernel | |
parent | 1cca3385e6d556cd90cdc148c2f26af807fa3600 (diff) |
signal: use current->state helpers
Call __set_current_state() instead of assigning the new state directly.
These interfaces also aid CONFIG_DEBUG_ATOMIC_SLEEP environments, keeping
track of who changed the state.
Signed-off-by: Davidlohr Bueso <dbueso@suse.de>
Acked-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/signal.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/signal.c b/kernel/signal.c index 33a52759cc0e..a390499943e4 100644 --- a/kernel/signal.c +++ b/kernel/signal.c | |||
@@ -3550,7 +3550,7 @@ SYSCALL_DEFINE2(signal, int, sig, __sighandler_t, handler) | |||
3550 | SYSCALL_DEFINE0(pause) | 3550 | SYSCALL_DEFINE0(pause) |
3551 | { | 3551 | { |
3552 | while (!signal_pending(current)) { | 3552 | while (!signal_pending(current)) { |
3553 | current->state = TASK_INTERRUPTIBLE; | 3553 | __set_current_state(TASK_INTERRUPTIBLE); |
3554 | schedule(); | 3554 | schedule(); |
3555 | } | 3555 | } |
3556 | return -ERESTARTNOHAND; | 3556 | return -ERESTARTNOHAND; |
@@ -3563,7 +3563,7 @@ int sigsuspend(sigset_t *set) | |||
3563 | current->saved_sigmask = current->blocked; | 3563 | current->saved_sigmask = current->blocked; |
3564 | set_current_blocked(set); | 3564 | set_current_blocked(set); |
3565 | 3565 | ||
3566 | current->state = TASK_INTERRUPTIBLE; | 3566 | __set_current_state(TASK_INTERRUPTIBLE); |
3567 | schedule(); | 3567 | schedule(); |
3568 | set_restore_sigmask(); | 3568 | set_restore_sigmask(); |
3569 | return -ERESTARTNOHAND; | 3569 | return -ERESTARTNOHAND; |