diff --git a/[refs] b/[refs] index 5264a4ab3adb..91b1e05bea55 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 691f6903dc389606b28b2200ecc0bcf1f53e548c +refs/heads/master: 302627e9f96e09269ccbfaf1951f46d29753856f diff --git a/trunk/arch/alpha/Kconfig b/trunk/arch/alpha/Kconfig index 8696c03a9d73..15740cf29bd4 100644 --- a/trunk/arch/alpha/Kconfig +++ b/trunk/arch/alpha/Kconfig @@ -24,6 +24,7 @@ config ALPHA select MODULES_USE_ELF_RELA select GENERIC_SIGALTSTACK select ODD_RT_SIGACTION + select OLD_SIGSUSPEND help The Alpha is a 64-bit general-purpose processor designed and marketed by the Digital Equipment Corporation of blessed memory, diff --git a/trunk/arch/alpha/kernel/signal.c b/trunk/arch/alpha/kernel/signal.c index 02d02c047f17..b5f385055244 100644 --- a/trunk/arch/alpha/kernel/signal.c +++ b/trunk/arch/alpha/kernel/signal.c @@ -112,16 +112,6 @@ SYSCALL_DEFINE5(rt_sigaction, int, sig, const struct sigaction __user *, act, return ret; } -/* - * Atomically swap in the new signal mask, and wait for a signal. - */ -SYSCALL_DEFINE1(sigsuspend, old_sigset_t, mask) -{ - sigset_t blocked; - siginitset(&blocked, mask); - return sigsuspend(&blocked); -} - /* * Do a signal return; undo the signal stack. */