]> Pileus Git - ~andy/linux/commitdiff
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)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Mar 2013 22:21:45 +0000 (15:21 -0700)
__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>
kernel/signal.c

index 43b0d4a1b7bace76e2dac9a87e2a2f6ab5efdf3e..dd72567767d963ccb8ac2f3cfa4a824fa5f81b4e 100644 (file)
@@ -485,7 +485,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);