Commit 522cff14 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

kernel/signal.c: use __ARCH_HAS_SA_RESTORER instead of SA_RESTORER

__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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2ca39528
...@@ -485,7 +485,7 @@ flush_signal_handlers(struct task_struct *t, int force_default) ...@@ -485,7 +485,7 @@ flush_signal_handlers(struct task_struct *t, int force_default)
if (force_default || ka->sa.sa_handler != SIG_IGN) if (force_default || ka->sa.sa_handler != SIG_IGN)
ka->sa.sa_handler = SIG_DFL; ka->sa.sa_handler = SIG_DFL;
ka->sa.sa_flags = 0; ka->sa.sa_flags = 0;
#ifdef SA_RESTORER #ifdef __ARCH_HAS_SA_RESTORER
ka->sa.sa_restorer = NULL; ka->sa.sa_restorer = NULL;
#endif #endif
sigemptyset(&ka->sa.sa_mask); sigemptyset(&ka->sa.sa_mask);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment