Merge branch 'timers-2038-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[muen/linux.git] / kernel / sched / core.c

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 7cbb5658be80c89d41d3a8f1d9614e7405152cb8..43f44539b88f888a21f67b407d0041f3add7e948 100644 (file)
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -5265,9 +5265,8 @@ SYSCALL_DEFINE2(sched_rr_get_interval, pid_t, pid,
 }
 
 #ifdef CONFIG_COMPAT_32BIT_TIME
 }
 
 #ifdef CONFIG_COMPAT_32BIT_TIME

-COMPAT_SYSCALL_DEFINE2(sched_rr_get_interval,
-                      compat_pid_t, pid,
-                      struct old_timespec32 __user *, interval)
+SYSCALL_DEFINE2(sched_rr_get_interval_time32, pid_t, pid,
+               struct old_timespec32 __user *, interval)

 {
        struct timespec64 t;
        int retval = sched_rr_get_interval(pid, &t);
 {
        struct timespec64 t;
        int retval = sched_rr_get_interval(pid, &t);