From caef1dfa06e1061e1b0be2e83d9f4f4a6f3ce856 Mon Sep 17 00:00:00 2001 From: Jeff Dike Date: Wed, 18 Jan 2006 17:44:03 -0800 Subject: [PATCH] --- yaml --- r: 18980 b: refs/heads/master c: 36a7878a224c18aa4a5e098dc93d19cf5601462b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/um/kernel/signal_kern.c | 24 ------------------------ trunk/include/asm-um/unistd.h | 1 + 3 files changed, 2 insertions(+), 25 deletions(-) diff --git a/[refs] b/[refs] index 4d18fb8a62aa..5f4f0a01df07 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2fc10620e741153329e2f1cbcde76e526f501410 +refs/heads/master: 36a7878a224c18aa4a5e098dc93d19cf5601462b diff --git a/trunk/arch/um/kernel/signal_kern.c b/trunk/arch/um/kernel/signal_kern.c index 7a54708db50c..da17b7541e08 100644 --- a/trunk/arch/um/kernel/signal_kern.c +++ b/trunk/arch/um/kernel/signal_kern.c @@ -185,30 +185,6 @@ long sys_sigsuspend(int history0, int history1, old_sigset_t mask) return -ERESTARTNOHAND; } -long sys_rt_sigsuspend(sigset_t __user *unewset, size_t sigsetsize) -{ - sigset_t newset; - - /* XXX: Don't preclude handling different sized sigset_t's. */ - if (sigsetsize != sizeof(sigset_t)) - return -EINVAL; - - if (copy_from_user(&newset, unewset, sizeof(newset))) - return -EFAULT; - sigdelsetmask(&newset, ~_BLOCKABLE); - - spin_lock_irq(¤t->sighand->siglock); - current->saved_sigmask = current->blocked; - current->blocked = newset; - recalc_sigpending(); - spin_unlock_irq(¤t->sighand->siglock); - - current->state = TASK_INTERRUPTIBLE; - schedule(); - set_thread_flag(TIF_RESTORE_SIGMASK); - return -ERESTARTNOHAND; -} - long sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss) { return(do_sigaltstack(uss, uoss, PT_REGS_SP(¤t->thread.regs))); diff --git a/trunk/include/asm-um/unistd.h b/trunk/include/asm-um/unistd.h index 6fdde45cc053..afccfcaa9ea9 100644 --- a/trunk/include/asm-um/unistd.h +++ b/trunk/include/asm-um/unistd.h @@ -34,6 +34,7 @@ extern int um_execve(const char *file, char *const argv[], char *const env[]); #define __ARCH_WANT_SYS_SIGPENDING #define __ARCH_WANT_SYS_SIGPROCMASK #define __ARCH_WANT_SYS_RT_SIGACTION +#define __ARCH_WANT_SYS_RT_SIGSUSPEND #endif #ifdef __KERNEL_SYSCALLS__