aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorAndrew Morton2013-03-13 16:59:34 -0500
committerGreg Kroah-Hartman2013-04-05 11:26:05 -0500
commit69fe7d3ff16b7b2566ab6aec652f020c94d10c42 (patch)
tree8322a5ac1d7a55a67b17f47b45873ae507fe5da9 /kernel
parent9dccad6a1590cc1f8c37e066e64155439dfc70cf (diff)
downloadkernel-omap-69fe7d3ff16b7b2566ab6aec652f020c94d10c42.tar.gz
kernel-omap-69fe7d3ff16b7b2566ab6aec652f020c94d10c42.tar.xz
kernel-omap-69fe7d3ff16b7b2566ab6aec652f020c94d10c42.zip
kernel/signal.c: use __ARCH_HAS_SA_RESTORER instead of SA_RESTORER
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>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/signal.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/signal.c b/kernel/signal.c
index 7591cccb26fa..dec9c305aec4 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -485,7 +485,7 @@ flush_signal_handlers(struct task_struct *t, int force_default)
485 if (force_default || ka->sa.sa_handler != SIG_IGN) 485 if (force_default || ka->sa.sa_handler != SIG_IGN)
486 ka->sa.sa_handler = SIG_DFL; 486 ka->sa.sa_handler = SIG_DFL;
487 ka->sa.sa_flags = 0; 487 ka->sa.sa_flags = 0;
488#ifdef SA_RESTORER 488#ifdef __ARCH_HAS_SA_RESTORER
489 ka->sa.sa_restorer = NULL; 489 ka->sa.sa_restorer = NULL;
490#endif 490#endif
491 sigemptyset(&ka->sa.sa_mask); 491 sigemptyset(&ka->sa.sa_mask);