From 439829c5790381e3b3161d5a4ff255fa281df742 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Sat, 16 Apr 2005 15:25:47 -0700
Subject: [PATCH] --- yaml --- r: 134 b: refs/heads/master c:
 6cae60feb6709dea4cb94da93d4d2ea039aee59d h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/kernel/signal.c | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 6c213005e0db..3c19aaf821ca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e821d94d34af23a31a16ead78e8b685b750c8c3d
+refs/heads/master: 6cae60feb6709dea4cb94da93d4d2ea039aee59d
diff --git a/trunk/kernel/signal.c b/trunk/kernel/signal.c
index f00a1d610f0b..e6567d7f2b62 100644
--- a/trunk/kernel/signal.c
+++ b/trunk/kernel/signal.c
@@ -1649,8 +1649,6 @@ void ptrace_notify(int exit_code)
 	spin_unlock_irq(&current->sighand->siglock);
 }
 
-#ifndef HAVE_ARCH_GET_SIGNAL_TO_DELIVER
-
 static void
 finish_stop(int stop_count)
 {
@@ -1962,8 +1960,6 @@ int get_signal_to_deliver(siginfo_t *info, struct k_sigaction *return_ka,
 	return signr;
 }
 
-#endif
-
 EXPORT_SYMBOL(recalc_sigpending);
 EXPORT_SYMBOL_GPL(dequeue_signal);
 EXPORT_SYMBOL(flush_signals);