diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2012-09-17 10:16:25 +0100 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2012-09-17 10:16:25 +0100 |
| commit | a6c00abe2bb9c18b22fc96bd4040737ff7b4a94b (patch) | |
| tree | 028b95214d06e7639a900d9931d11404a7304a30 | |
| parent | 8dab9815b9205daee265561bb662af0ff7f6dc06 (diff) | |
| download | linux-aarch64-a6c00abe2bb9c18b22fc96bd4040737ff7b4a94b.tar.gz | |
Revert "Add generic compat_sys_sched_rr_get_interval implementation"
This reverts commit 338a7bd9176617ae96bea8e73189484d41f7f1c0.
The compat_sys_sched_rr_get_interval prototype introduced by this patch
does not match the PowerPC implementation.
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
| -rw-r--r-- | include/linux/compat.h | 3 | ||||
| -rw-r--r-- | kernel/compat.c | 17 |
2 files changed, 0 insertions, 20 deletions
diff --git a/include/linux/compat.h b/include/linux/compat.h index 7b1783d9665..5f2d2ccf8db 100644 --- a/include/linux/compat.h +++ b/include/linux/compat.h @@ -593,9 +593,6 @@ asmlinkage ssize_t compat_sys_process_vm_writev(compat_pid_t pid, asmlinkage int compat_sys_sendfile(int out_fd, int in_fd, compat_off_t __user *offset, s32 count); -asmlinkage int compat_sys_sched_rr_get_interval(compat_pid_t pid, - struct compat_timespec __user *interval); - #else #define is_compat_task() (0) diff --git a/kernel/compat.c b/kernel/compat.c index b4afeadf101..c28a306ae05 100644 --- a/kernel/compat.c +++ b/kernel/compat.c @@ -1215,23 +1215,6 @@ compat_sys_sysinfo(struct compat_sysinfo __user *info) return 0; } -#ifdef __ARCH_WANT_COMPAT_SYS_SCHED_RR_GET_INTERVAL -asmlinkage int compat_sys_sched_rr_get_interval(compat_pid_t pid, - struct compat_timespec __user *interval) -{ - struct timespec t; - int ret; - mm_segment_t old_fs = get_fs(); - - set_fs(KERNEL_DS); - ret = sys_sched_rr_get_interval(pid, (struct timespec __user *)&t); - set_fs(old_fs); - if (put_compat_timespec(&t, interval)) - return -EFAULT; - return ret; -} -#endif /* __ARCH_WANT_COMPAT_SYS_SCHED_RR_GET_INTERVAL */ - /* * Allocate user-space memory for the duration of a single system call, * in order to marshall parameters inside a compat thunk. |