From d3e32fb3a3b21e702acffaaeb3b3c03a7a75b1e2 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Wed, 13 Mar 2013 14:59:34 -0700
Subject: [PATCH] --- yaml --- r: 361284 b: refs/heads/master c:
 522cff142d7d2f9230839c9e1f21a4d8bcc22a4a h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/kernel/signal.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 76fcfd7acd66..adc811e450a9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2ca39528c01a933f6689cd6505ce65bd6d68a530
+refs/heads/master: 522cff142d7d2f9230839c9e1f21a4d8bcc22a4a
diff --git a/trunk/kernel/signal.c b/trunk/kernel/signal.c
index 43b0d4a1b7ba..dd72567767d9 100644
--- a/trunk/kernel/signal.c
+++ b/trunk/kernel/signal.c
@@ -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);