Merge remote-tracking branch 'y2038/y2038'

[linux] / kernel / futex.c

diff --git a/kernel/futex.c b/kernel/futex.c
index 69e619b..873204a 100644 (file)
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -3811,7 +3811,7 @@ err_unlock:
 #endif /* CONFIG_COMPAT */
 
 #ifdef CONFIG_COMPAT_32BIT_TIME
-COMPAT_SYSCALL_DEFINE6(futex, u32 __user *, uaddr, int, op, u32, val,
+SYSCALL_DEFINE6(futex_time32, u32 __user *, uaddr, int, op, u32, val,
                struct old_timespec32 __user *, utime, u32 __user *, uaddr2,
                u32, val3)
 {