lkml.org 
[lkml]   [2013]   [Jun]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 023/184] kernel/signal.c: use __ARCH_HAS_SA_RESTORER instead
    2.6.32-longterm review patch.  If anyone has any objections, please let me know.

    ------------------
    of SA_RESTORER

    From: Andrew Morton <akpm@linux-foundation.org>

    commit 522cff142d7d2f9230839c9e1f21a4d8bcc22a4a upstream.

    __ARCH_HAS_SA_RESTORER is the preferred conditional for use in 3.9 and
    later kernels, per Kees.

    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Cc: Emese Revfy <re.emese@gmail.com>
    Cc: Emese Revfy <re.emese@gmail.com>
    Cc: PaX Team <pageexec@freemail.hu>
    Cc: Al Viro <viro@zeniv.linux.org.uk>
    Cc: Oleg Nesterov <oleg@redhat.com>
    Cc: "Eric W. Biederman" <ebiederm@xmission.com>
    Cc: Serge Hallyn <serge.hallyn@canonical.com>
    Cc: Julien Tinnes <jln@google.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Ben Hutchings <ben@decadent.org.uk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Willy Tarreau <w@1wt.eu>
    ---
    kernel/signal.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/kernel/signal.c b/kernel/signal.c
    index 845de15..fb7e242 100644
    --- a/kernel/signal.c
    +++ b/kernel/signal.c
    @@ -320,7 +320,7 @@ flush_signal_handlers(struct task_struct *t, int force_default)
    if (force_default || ka->sa.sa_handler != SIG_IGN)
    ka->sa.sa_handler = SIG_DFL;
    ka->sa.sa_flags = 0;
    -#ifdef SA_RESTORER
    +#ifdef __ARCH_HAS_SA_RESTORER
    ka->sa.sa_restorer = NULL;
    #endif
    sigemptyset(&ka->sa.sa_mask);
    --
    1.7.12.2.21.g234cd45.dirty




    \
     
     \ /
      Last update: 2013-06-05 03:21    [W:4.027 / U:0.140 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site