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

[muen/linux.git] / kernel / time / hrtimer.c

diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
index 6418e1bdc5491cf66549817a5f554713ccf2030c..41dfff23c1f9b4e8f7ed144331decf0d456fa7e8 100644 (file)
--- a/kernel/time/hrtimer.c
+++ b/kernel/time/hrtimer.c
@@ -1771,7 +1771,7 @@ SYSCALL_DEFINE2(nanosleep, struct __kernel_timespec __user *, rqtp,
 
 #ifdef CONFIG_COMPAT_32BIT_TIME
 
 
 #ifdef CONFIG_COMPAT_32BIT_TIME
 

-COMPAT_SYSCALL_DEFINE2(nanosleep, struct old_timespec32 __user *, rqtp,
+SYSCALL_DEFINE2(nanosleep_time32, struct old_timespec32 __user *, rqtp,

                       struct old_timespec32 __user *, rmtp)
 {
        struct timespec64 tu;
                       struct old_timespec32 __user *, rmtp)
 {
        struct timespec64 tu;