aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-12-25 17:33:40 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2013-02-03 18:33:00 -0500
commit0450d22f4b0c6ab88d2249a71f304326af5cc36c (patch)
tree02584741d3e58972320a4dd747141b3adc0095f1
parent1910f4ab777f17744aec3b39fa15d3d4340df6d4 (diff)
mips: switch to generic compat sched_rr_get_interval()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--arch/mips/kernel/linux32.c16
-rw-r--r--arch/mips/kernel/scall64-n32.S2
-rw-r--r--arch/mips/kernel/scall64-o32.S2
3 files changed, 2 insertions, 18 deletions
diff --git a/arch/mips/kernel/linux32.c b/arch/mips/kernel/linux32.c
index 7adab86c632c..703b37e13f78 100644
--- a/arch/mips/kernel/linux32.c
+++ b/arch/mips/kernel/linux32.c
@@ -119,22 +119,6 @@ SYSCALL_DEFINE6(32_pwrite, unsigned int, fd, const char __user *, buf,
119 return sys_pwrite64(fd, buf, count, merge_64(a4, a5)); 119 return sys_pwrite64(fd, buf, count, merge_64(a4, a5));
120} 120}
121 121
122SYSCALL_DEFINE2(32_sched_rr_get_interval, compat_pid_t, pid,
123 struct compat_timespec __user *, interval)
124{
125 struct timespec t;
126 int ret;
127 mm_segment_t old_fs = get_fs();
128
129 set_fs(KERNEL_DS);
130 ret = sys_sched_rr_get_interval(pid, (struct timespec __user *)&t);
131 set_fs(old_fs);
132 if (put_user (t.tv_sec, &interval->tv_sec) ||
133 __put_user(t.tv_nsec, &interval->tv_nsec))
134 return -EFAULT;
135 return ret;
136}
137
138#ifdef CONFIG_SYSVIPC 122#ifdef CONFIG_SYSVIPC
139 123
140SYSCALL_DEFINE6(32_ipc, u32, call, long, first, long, second, long, third, 124SYSCALL_DEFINE6(32_ipc, u32, call, long, first, long, second, long, third,
diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S
index 491c389b897f..5dfeba49ab4f 100644
--- a/arch/mips/kernel/scall64-n32.S
+++ b/arch/mips/kernel/scall64-n32.S
@@ -249,7 +249,7 @@ EXPORT(sysn32_call_table)
249 PTR sys_sched_getscheduler 249 PTR sys_sched_getscheduler
250 PTR sys_sched_get_priority_max 250 PTR sys_sched_get_priority_max
251 PTR sys_sched_get_priority_min 251 PTR sys_sched_get_priority_min
252 PTR sys_32_sched_rr_get_interval /* 6145 */ 252 PTR compat_sys_sched_rr_get_interval /* 6145 */
253 PTR sys_mlock 253 PTR sys_mlock
254 PTR sys_munlock 254 PTR sys_munlock
255 PTR sys_mlockall 255 PTR sys_mlockall
diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S
index 8362cc831151..6623077a9488 100644
--- a/arch/mips/kernel/scall64-o32.S
+++ b/arch/mips/kernel/scall64-o32.S
@@ -357,7 +357,7 @@ sys_call_table:
357 PTR sys_sched_yield 357 PTR sys_sched_yield
358 PTR sys_sched_get_priority_max 358 PTR sys_sched_get_priority_max
359 PTR sys_sched_get_priority_min 359 PTR sys_sched_get_priority_min
360 PTR sys_32_sched_rr_get_interval /* 4165 */ 360 PTR compat_sys_sched_rr_get_interval /* 4165 */
361 PTR compat_sys_nanosleep 361 PTR compat_sys_nanosleep
362 PTR sys_mremap 362 PTR sys_mremap
363 PTR sys_accept 363 PTR sys_accept