aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleg Nesterov <oleg@tv-sign.ru>2008-07-25 04:47:27 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-25 13:53:38 -0400
commit6715ca451cfff1c9ce4b33ad9918a1dacf43997c (patch)
treea66cdfd7026e7ad40ad0675a35ff35886216ed5f
parent96347e7759e2e433c427defa0fa1adfc8cce6226 (diff)
signals: collect_signal: remove the unneeded sigismember() check
collect_signal() checks sigismember(&list->signal, sig), this is not needed. This "sig" was just found by next_signal(), so it must be valid. We have a (completely broken) call to ->notifier in between, but it must not play with sigpending->signal bits or unlock ->siglock. Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru> Acked-by: Roland McGrath <roland@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--kernel/signal.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/kernel/signal.c b/kernel/signal.c
index 6c0958e52ea7..c5b9aabb1550 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -343,9 +343,6 @@ static int collect_signal(int sig, struct sigpending *list, siginfo_t *info)
343 struct sigqueue *q, *first = NULL; 343 struct sigqueue *q, *first = NULL;
344 int still_pending = 0; 344 int still_pending = 0;
345 345
346 if (unlikely(!sigismember(&list->signal, sig)))
347 return 0;
348
349 /* 346 /*
350 * Collect the siginfo appropriate to this signal. Check if 347 * Collect the siginfo appropriate to this signal. Check if
351 * there is another siginfo for the same signal. 348 * there is another siginfo for the same signal.