From 497d183be471c6deabc213c03288e55a9b0169e1 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Tue, 25 Dec 2012 15:28:39 -0500 Subject: [PATCH] --- yaml --- r: 356759 b: refs/heads/master c: 7b5d3c1d112d040b9eda239ec4ff247cf7102bd2 h: refs/heads/master i: 356757: a1bb8081be348a0932c59c9b15869989d0b45c63 356755: d27a865a7c4d2d4e200c40eebeb587bb67c1bf42 356751: 7e1c46d2cef06cb18f666f3c2d6e8d8056dc23c0 v: v3 --- [refs] | 2 +- trunk/arch/tile/Kconfig | 1 + trunk/arch/tile/include/asm/compat.h | 2 -- trunk/arch/tile/kernel/compat_signal.c | 15 --------------- 4 files changed, 2 insertions(+), 18 deletions(-) diff --git a/[refs] b/[refs] index 4c4531b1793f..d472e15f4a8a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 03e275959850f51754d3952489c36f4b1410856d +refs/heads/master: 7b5d3c1d112d040b9eda239ec4ff247cf7102bd2 diff --git a/trunk/arch/tile/Kconfig b/trunk/arch/tile/Kconfig index cf33ba4992bb..f81b2755b4be 100644 --- a/trunk/arch/tile/Kconfig +++ b/trunk/arch/tile/Kconfig @@ -22,6 +22,7 @@ config TILE select GENERIC_CLOCKEVENTS select MODULES_USE_ELF_RELA select GENERIC_SIGALTSTACK + select GENERIC_COMPAT_RT_SIGQUEUEINFO select GENERIC_COMPAT_RT_SIGPROCMASK select GENERIC_COMPAT_RT_SIGPENDING diff --git a/trunk/arch/tile/include/asm/compat.h b/trunk/arch/tile/include/asm/compat.h index f11be1f2fe2f..e81b70d025dd 100644 --- a/trunk/arch/tile/include/asm/compat.h +++ b/trunk/arch/tile/include/asm/compat.h @@ -278,8 +278,6 @@ struct compat_sigaltstack; long compat_sys_rt_sigaction(int sig, struct compat_sigaction __user *act, struct compat_sigaction __user *oact, size_t sigsetsize); -long compat_sys_rt_sigqueueinfo(int pid, int sig, - struct compat_siginfo __user *uinfo); long compat_sys_rt_sigreturn(void); long compat_sys_truncate64(char __user *filename, u32 dummy, u32 low, u32 high); long compat_sys_ftruncate64(unsigned int fd, u32 dummy, u32 low, u32 high); diff --git a/trunk/arch/tile/kernel/compat_signal.c b/trunk/arch/tile/kernel/compat_signal.c index 6228be73cdf2..6773e620cbfc 100644 --- a/trunk/arch/tile/kernel/compat_signal.c +++ b/trunk/arch/tile/kernel/compat_signal.c @@ -97,21 +97,6 @@ long compat_sys_rt_sigaction(int sig, struct compat_sigaction __user *act, return ret; } -long compat_sys_rt_sigqueueinfo(int pid, int sig, - struct compat_siginfo __user *uinfo) -{ - siginfo_t info; - int ret; - mm_segment_t old_fs = get_fs(); - - if (copy_siginfo_from_user32(&info, uinfo)) - return -EFAULT; - set_fs(KERNEL_DS); - ret = sys_rt_sigqueueinfo(pid, sig, (siginfo_t __force __user *)&info); - set_fs(old_fs); - return ret; -} - int copy_siginfo_to_user32(struct compat_siginfo __user *to, siginfo_t *from) { int err;