diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-12-25 15:28:39 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-02-03 18:16:22 -0500 |
commit | 7b5d3c1d112d040b9eda239ec4ff247cf7102bd2 (patch) | |
tree | 0b5420899fa5a6e748754a4b31b4c5280c9f59fc | |
parent | 03e275959850f51754d3952489c36f4b1410856d (diff) |
tile: switch to generic compat rt_sigqueueinfo()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r-- | arch/tile/Kconfig | 1 | ||||
-rw-r--r-- | arch/tile/include/asm/compat.h | 2 | ||||
-rw-r--r-- | arch/tile/kernel/compat_signal.c | 15 |
3 files changed, 1 insertions, 17 deletions
diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig index cf33ba4992bb..f81b2755b4be 100644 --- a/arch/tile/Kconfig +++ b/arch/tile/Kconfig | |||
@@ -22,6 +22,7 @@ config TILE | |||
22 | select GENERIC_CLOCKEVENTS | 22 | select GENERIC_CLOCKEVENTS |
23 | select MODULES_USE_ELF_RELA | 23 | select MODULES_USE_ELF_RELA |
24 | select GENERIC_SIGALTSTACK | 24 | select GENERIC_SIGALTSTACK |
25 | select GENERIC_COMPAT_RT_SIGQUEUEINFO | ||
25 | select GENERIC_COMPAT_RT_SIGPROCMASK | 26 | select GENERIC_COMPAT_RT_SIGPROCMASK |
26 | select GENERIC_COMPAT_RT_SIGPENDING | 27 | select GENERIC_COMPAT_RT_SIGPENDING |
27 | 28 | ||
diff --git a/arch/tile/include/asm/compat.h b/arch/tile/include/asm/compat.h index f11be1f2fe2f..e81b70d025dd 100644 --- a/arch/tile/include/asm/compat.h +++ b/arch/tile/include/asm/compat.h | |||
@@ -278,8 +278,6 @@ struct compat_sigaltstack; | |||
278 | long compat_sys_rt_sigaction(int sig, struct compat_sigaction __user *act, | 278 | long compat_sys_rt_sigaction(int sig, struct compat_sigaction __user *act, |
279 | struct compat_sigaction __user *oact, | 279 | struct compat_sigaction __user *oact, |
280 | size_t sigsetsize); | 280 | size_t sigsetsize); |
281 | long compat_sys_rt_sigqueueinfo(int pid, int sig, | ||
282 | struct compat_siginfo __user *uinfo); | ||
283 | long compat_sys_rt_sigreturn(void); | 281 | long compat_sys_rt_sigreturn(void); |
284 | long compat_sys_truncate64(char __user *filename, u32 dummy, u32 low, u32 high); | 282 | long compat_sys_truncate64(char __user *filename, u32 dummy, u32 low, u32 high); |
285 | long compat_sys_ftruncate64(unsigned int fd, u32 dummy, u32 low, u32 high); | 283 | long compat_sys_ftruncate64(unsigned int fd, u32 dummy, u32 low, u32 high); |
diff --git a/arch/tile/kernel/compat_signal.c b/arch/tile/kernel/compat_signal.c index 6228be73cdf2..6773e620cbfc 100644 --- a/arch/tile/kernel/compat_signal.c +++ b/arch/tile/kernel/compat_signal.c | |||
@@ -97,21 +97,6 @@ out: | |||
97 | return ret; | 97 | return ret; |
98 | } | 98 | } |
99 | 99 | ||
100 | long compat_sys_rt_sigqueueinfo(int pid, int sig, | ||
101 | struct compat_siginfo __user *uinfo) | ||
102 | { | ||
103 | siginfo_t info; | ||
104 | int ret; | ||
105 | mm_segment_t old_fs = get_fs(); | ||
106 | |||
107 | if (copy_siginfo_from_user32(&info, uinfo)) | ||
108 | return -EFAULT; | ||
109 | set_fs(KERNEL_DS); | ||
110 | ret = sys_rt_sigqueueinfo(pid, sig, (siginfo_t __force __user *)&info); | ||
111 | set_fs(old_fs); | ||
112 | return ret; | ||
113 | } | ||
114 | |||
115 | int copy_siginfo_to_user32(struct compat_siginfo __user *to, siginfo_t *from) | 100 | int copy_siginfo_to_user32(struct compat_siginfo __user *to, siginfo_t *from) |
116 | { | 101 | { |
117 | int err; | 102 | int err; |