Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 24557
b: refs/heads/master
c: a9e88e8
h: refs/heads/master
i:
  24555: f0639ec
v: v3
  • Loading branch information
Oleg Nesterov authored and Linus Torvalds committed Mar 29, 2006
1 parent e71e27f commit 9e0d7b6
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f63ee72e0fb82e504a0489490babc7612c7cd6c2
refs/heads/master: a9e88e84b5245da0a1dadb6ccca70ae84e93ccf6
5 changes: 4 additions & 1 deletion trunk/kernel/signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,9 @@ static kmem_cache_t *sigqueue_cachep;
#define sig_kernel_stop(sig) \
(((sig) < SIGRTMIN) && T(sig, SIG_KERNEL_STOP_MASK))

#define sig_needs_tasklist(sig) \
(((sig) < SIGRTMIN) && T(sig, SIG_KERNEL_STOP_MASK | M(SIGCONT)))

#define sig_user_defined(t, signr) \
(((t)->sighand->action[(signr)-1].sa.sa_handler != SIG_DFL) && \
((t)->sighand->action[(signr)-1].sa.sa_handler != SIG_IGN))
Expand Down Expand Up @@ -1199,7 +1202,7 @@ kill_proc_info(int sig, struct siginfo *info, pid_t pid)
struct task_struct *p;

rcu_read_lock();
if (unlikely(sig_kernel_stop(sig) || sig == SIGCONT)) {
if (unlikely(sig_needs_tasklist(sig))) {
read_lock(&tasklist_lock);
acquired_tasklist_lock = 1;
}
Expand Down

0 comments on commit 9e0d7b6

Please sign in to comment.