From: Oleg Nesterov <oleg@redhat.com>
To: Linus Torvalds <torvalds@linux-foundation.org>,
Andrew Morton <akpm@linux-foundation.org>
Cc: Tejun Heo <tj@kernel.org>,
"Nikita V. Youshchenko" <nyoushchenko@mvista.com>,
Matt Fleming <matt@console-pimps.org>,
linux-kernel@vger.kernel.org
Subject: [PATCH v2 6/6] signal: rename signandsets() to sigandnsets()
Date: Tue, 26 Apr 2011 21:50:18 +0200 [thread overview]
Message-ID: <20110426195018.GG8520@redhat.com> (raw)
In-Reply-To: <20110426194822.GA8520@redhat.com>
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>
---
include/linux/signal.h | 6 +++---
kernel/signal.c | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
--- sigprocmask/include/linux/signal.h~6_rename_nand 2011-04-26 19:53:42.000000000 +0200
+++ sigprocmask/include/linux/signal.h 2011-04-26 19:58:01.000000000 +0200
@@ -123,13 +123,13 @@ _SIG_SET_BINOP(sigorsets, _sig_or)
#define _sig_and(x,y) ((x) & (y))
_SIG_SET_BINOP(sigandsets, _sig_and)
-#define _sig_nand(x,y) ((x) & ~(y))
-_SIG_SET_BINOP(signandsets, _sig_nand)
+#define _sig_andn(x,y) ((x) & ~(y))
+_SIG_SET_BINOP(sigandnsets, _sig_andn)
#undef _SIG_SET_BINOP
#undef _sig_or
#undef _sig_and
-#undef _sig_nand
+#undef _sig_andn
#define _SIG_SET_OP(name, op) \
static inline void name(sigset_t *set) \
--- sigprocmask/kernel/signal.c~6_rename_nand 2011-04-26 19:54:20.000000000 +0200
+++ sigprocmask/kernel/signal.c 2011-04-26 19:59:43.000000000 +0200
@@ -592,7 +592,7 @@ static int rm_from_queue_full(sigset_t *
if (sigisemptyset(&m))
return 0;
- signandsets(&s->signal, &s->signal, mask);
+ sigandnsets(&s->signal, &s->signal, mask);
list_for_each_entry_safe(q, n, &s->list, list) {
if (sigismember(mask, q->info.si_signo)) {
list_del_init(&q->list);
@@ -2119,7 +2119,7 @@ static void __set_task_blocked(struct ta
{
if (signal_pending(tsk) && !thread_group_empty(tsk)) {
sigset_t newblocked;
- signandsets(&newblocked, newset, ¤t->blocked);
+ sigandnsets(&newblocked, newset, ¤t->blocked);
retarget_shared_pending(tsk, &newblocked);
}
tsk->blocked = *newset;
@@ -2157,7 +2157,7 @@ int sigprocmask(int how, sigset_t *set,
sigorsets(&newset, &tsk->blocked, set);
break;
case SIG_UNBLOCK:
- signandsets(&newset, &tsk->blocked, set);
+ sigandnsets(&newset, &tsk->blocked, set);
break;
case SIG_SETMASK:
newset = *set;
next prev parent reply other threads:[~2011-04-26 19:51 UTC|newest]
Thread overview: 88+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-18 13:44 [RFC PATCH v2 0/7] signal: sigprocmask fixes Oleg Nesterov
2011-04-18 13:44 ` [PATCH v2 1/7] signal: introduce retarget_shared_pending() Oleg Nesterov
2011-04-22 12:04 ` Matt Fleming
2011-04-25 10:49 ` Tejun Heo
2011-04-18 13:45 ` [PATCH v2 2/7] signal: retarget_shared_pending: consider shared/unblocked signals only Oleg Nesterov
2011-04-22 12:22 ` Matt Fleming
2011-04-25 10:52 ` Tejun Heo
2011-04-25 15:20 ` Oleg Nesterov
2011-04-25 16:19 ` Tejun Heo
2011-04-25 17:02 ` Oleg Nesterov
2011-04-25 17:11 ` Tejun Heo
2011-04-26 19:45 ` Oleg Nesterov
2011-04-28 15:26 ` [PATCHSET] signals-review branch Oleg Nesterov
2011-04-30 12:51 ` Tejun Heo
2011-04-18 13:45 ` [PATCH v2 3/7] signal: retarget_shared_pending: optimize while_each_thread() loop Oleg Nesterov
2011-04-22 12:26 ` Matt Fleming
2011-04-25 11:03 ` Tejun Heo
2011-04-18 13:45 ` [PATCH v2 4/7] signal: sigprocmask: narrow the scope of ->siglock Oleg Nesterov
2011-04-22 12:31 ` Matt Fleming
2011-04-25 11:05 ` Tejun Heo
2011-04-18 13:45 ` [PATCH v2 5/7] signal: sigprocmask() should do retarget_shared_pending() Oleg Nesterov
2011-04-22 12:46 ` Matt Fleming
2011-04-25 11:14 ` Tejun Heo
2011-04-18 13:46 ` [PATCH v2 6/7] x86: signal: handle_signal() should use set_current_blocked() Oleg Nesterov
2011-04-22 13:45 ` Matt Fleming
2011-04-25 11:19 ` Tejun Heo
2011-04-18 13:46 ` [PATCH v2 7/7] x86: signal: sys_rt_sigreturn() " Oleg Nesterov
2011-04-22 14:14 ` Matt Fleming
2011-04-23 18:12 ` Oleg Nesterov
2011-04-25 11:21 ` Tejun Heo
2011-04-18 13:47 ` [PATCH v2 8/7] signal: cleanup sys_rt_sigprocmask() Oleg Nesterov
2011-04-22 14:30 ` Matt Fleming
2011-04-23 18:20 ` Oleg Nesterov
2011-04-23 18:47 ` Matt Fleming
2011-04-25 11:26 ` Tejun Heo
2011-04-18 17:16 ` [RFC PATCH v2 0/7] signal: sigprocmask fixes Linus Torvalds
2011-04-18 17:32 ` Oleg Nesterov
2011-04-18 17:40 ` Linus Torvalds
2011-04-23 17:59 ` [PATCH 0/3] do_sigtimedwait() needs retarget_shared_pending() Oleg Nesterov
2011-04-23 17:59 ` [PATCH 1/3] signal: sys_rt_sigtimedwait: simplify the timeout logic Oleg Nesterov
2011-04-25 11:37 ` Tejun Heo
2011-04-25 17:26 ` Oleg Nesterov
2011-04-25 17:34 ` Linus Torvalds
2011-04-25 17:56 ` Oleg Nesterov
2011-04-25 19:38 ` Linus Torvalds
2011-04-26 10:18 ` Matt Fleming
2011-04-23 17:59 ` [PATCH 2/3] signal: introduce do_sigtimedwait() to factor out compat/native code Oleg Nesterov
2011-04-25 11:39 ` Tejun Heo
2011-04-25 11:49 ` Tejun Heo
2011-04-25 15:33 ` Oleg Nesterov
2011-04-25 16:25 ` Tejun Heo
2011-04-26 10:28 ` Matt Fleming
2011-04-23 18:00 ` [PATCH 3/3] signal: do_sigtimedwait() needs retarget_shared_pending() Oleg Nesterov
2011-04-25 11:52 ` Tejun Heo
2011-04-25 16:01 ` Oleg Nesterov
2011-04-25 16:27 ` Tejun Heo
2011-04-25 17:07 ` Oleg Nesterov
2011-04-25 17:12 ` Tejun Heo
2011-04-26 10:40 ` Matt Fleming
2011-04-26 10:42 ` Matt Fleming
2011-04-26 19:48 ` [PATCH v2 0/6] sigtimedwait/sigprocmask need retarget_shared_pending() Oleg Nesterov
2011-04-26 19:48 ` [PATCH v2 1/6] signal: sys_rt_sigtimedwait: simplify the timeout logic Oleg Nesterov
2011-04-26 19:49 ` [PATCH v2 2/6] signal: introduce do_sigtimedwait() to factor out compat/native code Oleg Nesterov
2011-04-27 10:09 ` Tejun Heo
2011-04-27 21:24 ` Matt Fleming
2011-05-11 16:21 ` Mike Frysinger
2011-05-12 18:54 ` Oleg Nesterov
2011-05-13 16:44 ` [PATCH] signal: trivial, fix the "timespec declared inside parameter list" warning Oleg Nesterov
2011-05-13 18:09 ` Mike Frysinger
2011-05-16 12:57 ` Oleg Nesterov
2011-05-16 12:57 ` [PATCH v2] " Oleg Nesterov
2011-05-16 17:39 ` Mike Frysinger
2011-05-18 23:37 ` Andrew Morton
2011-05-19 18:19 ` Oleg Nesterov
2011-05-19 19:21 ` Mike Frysinger
2011-04-26 19:49 ` [PATCH v2 3/6] signal: do_sigtimedwait() needs retarget_shared_pending() Oleg Nesterov
2011-04-26 19:49 ` [PATCH v2 4/6] signal: cleanup sys_sigprocmask() Oleg Nesterov
2011-04-27 10:12 ` Tejun Heo
2011-04-27 21:31 ` Matt Fleming
2011-04-26 19:50 ` [PATCH v2 5/6] signal: sys_sigprocmask() needs retarget_shared_pending() Oleg Nesterov
2011-04-26 21:43 ` Linus Torvalds
2011-04-27 12:57 ` Oleg Nesterov
2011-04-27 13:04 ` Tejun Heo
2011-05-01 20:07 ` [PATCH v2 0/1] " Oleg Nesterov
2011-05-01 20:08 ` [PATCH v2 1/1] " Oleg Nesterov
2011-04-26 19:50 ` Oleg Nesterov [this message]
2011-04-27 10:11 ` [PATCH v2 6/6] signal: rename signandsets() to sigandnsets() Tejun Heo
2011-04-27 21:43 ` Matt Fleming
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110426195018.GG8520@redhat.com \
--to=oleg@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=matt@console-pimps.org \
--cc=nyoushchenko@mvista.com \
--cc=tj@kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).