kernel/signal.c: use __ARCH_HAS_SA_RESTORER instead of SA_RESTORER
authorAndrew Morton <akpm@linux-foundation.org>
Wed, 13 Mar 2013 21:59:34 +0000 (14:59 -0700)
committerBen Hutchings <ben@decadent.org.uk>
Wed, 27 Mar 2013 02:41:25 +0000 (02:41 +0000)
commit 522cff142d7d2f9230839c9e1f21a4d8bcc22a4a upstream.

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

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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
kernel/signal.c

index 71e1816..ea76d30 100644 (file)
@@ -481,7 +481,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);