From 3b2291cfb4bc6428d7538a9dbae0d166f8d5decd Mon Sep 17 00:00:00 2001 From: Al Viro Date: Tue, 25 Dec 2012 16:27:55 -0500 Subject: [PATCH] --- yaml --- r: 356679 b: refs/heads/master c: 39e08a9bae71a16ab0549b87b4e7207ae0d550ad h: refs/heads/master i: 356677: 6ec0614bcc8684e3a092e3c2869912d66e540afe 356675: 512ca8536ec50566baa9238f52e03ae9f0b3baf3 356671: 9e023ceb9ec558d484bfc2f64b661f8091937034 v: v3 --- [refs] | 2 +- trunk/arch/frv/Kconfig | 1 + trunk/arch/frv/kernel/signal.c | 10 ---------- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 38f59d933e15..76542dc7e128 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fe76141671c3025cd0da7cfafb6d8945bbe0735b +refs/heads/master: 39e08a9bae71a16ab0549b87b4e7207ae0d550ad diff --git a/trunk/arch/frv/Kconfig b/trunk/arch/frv/Kconfig index 8aaf1a174270..683ab5c90233 100644 --- a/trunk/arch/frv/Kconfig +++ b/trunk/arch/frv/Kconfig @@ -13,6 +13,7 @@ config FRV select GENERIC_CPU_DEVICES select ARCH_WANT_IPC_PARSE_VERSION select GENERIC_SIGALTSTACK + select OLD_SIGSUSPEND3 config ZONE_DMA bool diff --git a/trunk/arch/frv/kernel/signal.c b/trunk/arch/frv/kernel/signal.c index 445156d2d30b..771756b7a7e8 100644 --- a/trunk/arch/frv/kernel/signal.c +++ b/trunk/arch/frv/kernel/signal.c @@ -32,16 +32,6 @@ struct fdpic_func_descriptor { unsigned long GOT; }; -/* - * Atomically swap in the new signal mask, and wait for a signal. - */ -asmlinkage int sys_sigsuspend(int history0, int history1, old_sigset_t mask) -{ - sigset_t blocked; - siginitset(&blocked, mask); - return sigsuspend(&blocked); -} - asmlinkage int sys_sigaction(int sig, const struct old_sigaction __user *act, struct old_sigaction __user *oact)