aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/signal.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/signal.c')
-rw-r--r--kernel/signal.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/signal.c b/kernel/signal.c
index 4d97e11d7672..e7ee4e642c5a 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -669,7 +669,7 @@ static int rm_from_queue_full(sigset_t *mask, struct sigpending *s)
669 if (sigisemptyset(&m)) 669 if (sigisemptyset(&m))
670 return 0; 670 return 0;
671 671
672 signandsets(&s->signal, &s->signal, mask); 672 sigandnsets(&s->signal, &s->signal, mask);
673 list_for_each_entry_safe(q, n, &s->list, list) { 673 list_for_each_entry_safe(q, n, &s->list, list) {
674 if (sigismember(mask, q->info.si_signo)) { 674 if (sigismember(mask, q->info.si_signo)) {
675 list_del_init(&q->list); 675 list_del_init(&q->list);
@@ -2304,7 +2304,7 @@ static void __set_task_blocked(struct task_struct *tsk, const sigset_t *newset)
2304 if (signal_pending(tsk) && !thread_group_empty(tsk)) { 2304 if (signal_pending(tsk) && !thread_group_empty(tsk)) {
2305 sigset_t newblocked; 2305 sigset_t newblocked;
2306 /* A set of now blocked but previously unblocked signals. */ 2306 /* A set of now blocked but previously unblocked signals. */
2307 signandsets(&newblocked, newset, &current->blocked); 2307 sigandnsets(&newblocked, newset, &current->blocked);
2308 retarget_shared_pending(tsk, &newblocked); 2308 retarget_shared_pending(tsk, &newblocked);
2309 } 2309 }
2310 tsk->blocked = *newset; 2310 tsk->blocked = *newset;
@@ -2349,7 +2349,7 @@ int sigprocmask(int how, sigset_t *set, sigset_t *oldset)
2349 sigorsets(&newset, &tsk->blocked, set); 2349 sigorsets(&newset, &tsk->blocked, set);
2350 break; 2350 break;
2351 case SIG_UNBLOCK: 2351 case SIG_UNBLOCK:
2352 signandsets(&newset, &tsk->blocked, set); 2352 sigandnsets(&newset, &tsk->blocked, set);
2353 break; 2353 break;
2354 case SIG_SETMASK: 2354 case SIG_SETMASK:
2355 newset = *set; 2355 newset = *set;