lkml.org 
[lkml]   [2011]   [Apr]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH v2 6/6] signal: rename signandsets() to sigandnsets()
    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, &current->blocked);
    + sigandnsets(&newblocked, newset, &current->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;


    \
     
     \ /
      Last update: 2011-04-26 21:53    [W:0.037 / U:33.348 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site