diff options
| author | Helge Deller <deller@gmx.de> | 2013-02-19 21:42:45 +0100 |
|---|---|---|
| committer | Helge Deller <deller@gmx.de> | 2013-02-20 22:57:22 +0100 |
| commit | e27da28a565e2a4d82a2d1adc9e0ba4aadd61e97 (patch) | |
| tree | 58381034d7f97adaf893933bc922dd16e6910e75 | |
| parent | 4474a331cfccc5092b79e3839205aacf44f3a571 (diff) | |
| download | linux-e27da28a565e2a4d82a2d1adc9e0ba4aadd61e97.tar.gz linux-e27da28a565e2a4d82a2d1adc9e0ba4aadd61e97.tar.bz2 linux-e27da28a565e2a4d82a2d1adc9e0ba4aadd61e97.zip | |
parisc: switch to available compat_sched_rr_get_interval implementation
Signed-off-by: Helge Deller <deller@gmx.de>
| -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) \ #define __ARCH_WANT_SYS_SIGNAL #define __ARCH_WANT_SYS_TIME #define __ARCH_WANT_COMPAT_SYS_TIME +#define __ARCH_WANT_COMPAT_SYS_SCHED_RR_GET_INTERVAL #define __ARCH_WANT_SYS_UTIME #define __ARCH_WANT_SYS_WAITPID #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, return -ENOSYS; } -asmlinkage long sys32_sched_rr_get_interval(pid_t pid, - struct compat_timespec __user *interval) -{ - struct timespec t; - int ret; - - KERNEL_SYSCALL(ret, sys_sched_rr_get_interval, pid, (struct timespec __user *)&t); - if (put_compat_timespec(&t, interval)) - return -EFAULT; - return ret; -} - asmlinkage int sys32_sendfile(int out_fd, int in_fd, compat_off_t __user *offset, s32 count) { 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 @@ ENTRY_SAME(sched_yield) ENTRY_SAME(sched_get_priority_max) ENTRY_SAME(sched_get_priority_min) /* 160 */ - /* These 2 would've worked if someone had defined struct timespec - * carefully, like timeval for example (which is about the same). - * Unfortunately it contains a long :-( */ - ENTRY_DIFF(sched_rr_get_interval) + ENTRY_COMP(sched_rr_get_interval) ENTRY_COMP(nanosleep) ENTRY_SAME(mremap) ENTRY_SAME(setresuid) |