GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-22 06:32:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

signal: rename signandsets() to sigandnsets()

Browse source 
As Tejun and Linus pointed out, "nand" is the wrong name for "x & ~y",
it should be "andn". Rename signandsets() as suggested.

Suggested-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Acked-by: Tejun Heo <tj@kernel.org>
This commit is contained in:
Oleg Nesterov 2011-04-27 22:01:27 +02:00
parent b182801ab3
commit 702a5073fd
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/linux/signal.h
View file

@ -123,13 +123,13 @@ _SIG_SET_BINOP(sigorsets, _sig_or)
#define _sig_and(x,y) ((x) & (y)) #define _sig_and(x,y) ((x) & (y))
_SIG_SET_BINOP(sigandsets, _sig_and) _SIG_SET_BINOP(sigandsets, _sig_and)
#define _sig_nand(x,y) ((x) & ~(y)) #define _sig_andn(x,y) ((x) & ~(y))
_SIG_SET_BINOP(signandsets, _sig_nand) _SIG_SET_BINOP(sigandnsets, _sig_andn)
#undef _SIG_SET_BINOP #undef _SIG_SET_BINOP
#undef _sig_or #undef _sig_or
#undef _sig_and #undef _sig_and
#undef _sig_nand #undef _sig_andn
#define _SIG_SET_OP(name, op) \ #define _SIG_SET_OP(name, op) \
static inline void name(sigset_t *set) \ static inline void name(sigset_t *set) \

6
kernel/signal.c
View file

@ -669,7 +669,7 @@ static int rm_from_queue_full(sigset_t *mask, struct sigpending *s)
if (sigisemptyset(&m)) if (sigisemptyset(&m))
return 0; return 0;
signandsets(&s->signal, &s->signal, mask); sigandnsets(&s->signal, &s->signal, mask);
list_for_each_entry_safe(q, n, &s->list, list) { list_for_each_entry_safe(q, n, &s->list, list) {
if (sigismember(mask, q->info.si_signo)) { if (sigismember(mask, q->info.si_signo)) {
list_del_init(&q->list); list_del_init(&q->list);
@ -2304,7 +2304,7 @@ static void __set_task_blocked(struct task_struct *tsk, const sigset_t *newset)
if (signal_pending(tsk) && !thread_group_empty(tsk)) { if (signal_pending(tsk) && !thread_group_empty(tsk)) {
sigset_t newblocked; sigset_t newblocked;
/* A set of now blocked but previously unblocked signals. */ /* A set of now blocked but previously unblocked signals. */
signandsets(&newblocked, newset, &current->blocked); sigandnsets(&newblocked, newset, &current->blocked);
retarget_shared_pending(tsk, &newblocked); retarget_shared_pending(tsk, &newblocked);
} }
tsk->blocked = *newset; tsk->blocked = *newset;
@ -2349,7 +2349,7 @@ int sigprocmask(int how, sigset_t *set, sigset_t *oldset)
sigorsets(&newset, &tsk->blocked, set); sigorsets(&newset, &tsk->blocked, set);
break; break;
case SIG_UNBLOCK: case SIG_UNBLOCK:
signandsets(&newset, &tsk->blocked, set); sigandnsets(&newset, &tsk->blocked, set);
break; break;
case SIG_SETMASK: case SIG_SETMASK:
newset = *set; newset = *set;