diff options
author | Helge Deller <deller@gmx.de> | 2013-02-19 15:42:45 -0500 |
---|---|---|
committer | Helge Deller <deller@gmx.de> | 2013-02-20 16:57:22 -0500 |
commit | e27da28a565e2a4d82a2d1adc9e0ba4aadd61e97 (patch) | |
tree | 58381034d7f97adaf893933bc922dd16e6910e75 /arch/parisc | |
parent | 4474a331cfccc5092b79e3839205aacf44f3a571 (diff) |
parisc: switch to available compat_sched_rr_get_interval implementation
Signed-off-by: Helge Deller <deller@gmx.de>
Diffstat (limited to 'arch/parisc')
-rw-r--r-- | arch/parisc/include/asm/unistd.h | 1 | ||||
-rw-r--r-- | arch/parisc/kernel/sys_parisc32.c | 12 | ||||
-rw-r--r-- | arch/parisc/kernel/syscall_table.S | 5 |
3 files changed, 2 insertions, 16 deletions
diff --git a/arch/parisc/include/asm/unistd.h b/arch/parisc/include/asm/unistd.h index 3043194547cd..f2e390fe74cf 100644 --- a/arch/parisc/include/asm/unistd.h +++ b/arch/parisc/include/asm/unistd.h | |||
@@ -149,6 +149,7 @@ type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5) \ | |||
149 | #define __ARCH_WANT_SYS_SIGNAL | 149 | #define __ARCH_WANT_SYS_SIGNAL |
150 | #define __ARCH_WANT_SYS_TIME | 150 | #define __ARCH_WANT_SYS_TIME |
151 | #define __ARCH_WANT_COMPAT_SYS_TIME | 151 | #define __ARCH_WANT_COMPAT_SYS_TIME |
152 | #define __ARCH_WANT_COMPAT_SYS_SCHED_RR_GET_INTERVAL | ||
152 | #define __ARCH_WANT_SYS_UTIME | 153 | #define __ARCH_WANT_SYS_UTIME |
153 | #define __ARCH_WANT_SYS_WAITPID | 154 | #define __ARCH_WANT_SYS_WAITPID |
154 | #define __ARCH_WANT_SYS_SOCKETCALL | 155 | #define __ARCH_WANT_SYS_SOCKETCALL |
diff --git a/arch/parisc/kernel/sys_parisc32.c b/arch/parisc/kernel/sys_parisc32.c index 986294425e86..0115eac76c39 100644 --- a/arch/parisc/kernel/sys_parisc32.c +++ b/arch/parisc/kernel/sys_parisc32.c | |||
@@ -60,18 +60,6 @@ asmlinkage long sys32_unimplemented(int r26, int r25, int r24, int r23, | |||
60 | return -ENOSYS; | 60 | return -ENOSYS; |
61 | } | 61 | } |
62 | 62 | ||
63 | asmlinkage long sys32_sched_rr_get_interval(pid_t pid, | ||
64 | struct compat_timespec __user *interval) | ||
65 | { | ||
66 | struct timespec t; | ||
67 | int ret; | ||
68 | |||
69 | KERNEL_SYSCALL(ret, sys_sched_rr_get_interval, pid, (struct timespec __user *)&t); | ||
70 | if (put_compat_timespec(&t, interval)) | ||
71 | return -EFAULT; | ||
72 | return ret; | ||
73 | } | ||
74 | |||
75 | asmlinkage int sys32_sendfile(int out_fd, int in_fd, compat_off_t __user *offset, s32 count) | 63 | asmlinkage int sys32_sendfile(int out_fd, int in_fd, compat_off_t __user *offset, s32 count) |
76 | { | 64 | { |
77 | mm_segment_t old_fs = get_fs(); | 65 | mm_segment_t old_fs = get_fs(); |
diff --git a/arch/parisc/kernel/syscall_table.S b/arch/parisc/kernel/syscall_table.S index 2a5f82985aa8..9180719dad04 100644 --- a/arch/parisc/kernel/syscall_table.S +++ b/arch/parisc/kernel/syscall_table.S | |||
@@ -247,10 +247,7 @@ | |||
247 | ENTRY_SAME(sched_yield) | 247 | ENTRY_SAME(sched_yield) |
248 | ENTRY_SAME(sched_get_priority_max) | 248 | ENTRY_SAME(sched_get_priority_max) |
249 | ENTRY_SAME(sched_get_priority_min) /* 160 */ | 249 | ENTRY_SAME(sched_get_priority_min) /* 160 */ |
250 | /* These 2 would've worked if someone had defined struct timespec | 250 | ENTRY_COMP(sched_rr_get_interval) |
251 | * carefully, like timeval for example (which is about the same). | ||
252 | * Unfortunately it contains a long :-( */ | ||
253 | ENTRY_DIFF(sched_rr_get_interval) | ||
254 | ENTRY_COMP(nanosleep) | 251 | ENTRY_COMP(nanosleep) |
255 | ENTRY_SAME(mremap) | 252 | ENTRY_SAME(mremap) |
256 | ENTRY_SAME(setresuid) | 253 | ENTRY_SAME(setresuid) |