From: Paolo 'Blaisorblade' Giarrusso Keeping this function does not makes sense because it's a copied (and buggy) copy of sys_time. The only difference is that now.tv_sec (which is a time_t, i.e. a 64-bit long) is copied (and truncated) into a int (32-bit). The prototype is the same (they both take a long __user *), so let's drop this and redirect it to sys_time (and make sure it exists by defining __ARCH_WANT_SYS_TIME). Only disadvantage is that the sys_stime definition is also compiled (may be fixed if needed by adding a separate __ARCH_WANT_SYS_STIME macro, and defining it for all arch's defining __ARCH_WANT_SYS_TIME except x86_64). Signed-off-by: Paolo 'Blaisorblade' Giarrusso CC: Andi Kleen Signed-off-by: Andrew Morton --- 25-akpm/arch/x86_64/kernel/sys_x86_64.c | 14 -------------- 25-akpm/include/asm-x86_64/unistd.h | 3 ++- 2 files changed, 2 insertions(+), 15 deletions(-) diff -puN arch/x86_64/kernel/sys_x86_64.c~x86_64-remove-duplicated-sys_time64 arch/x86_64/kernel/sys_x86_64.c --- 25/arch/x86_64/kernel/sys_x86_64.c~x86_64-remove-duplicated-sys_time64 2005-03-30 18:01:57.000000000 -0800 +++ 25-akpm/arch/x86_64/kernel/sys_x86_64.c 2005-03-30 18:01:57.000000000 -0800 @@ -158,17 +158,3 @@ asmlinkage long wrap_sys_shmat(int shmid unsigned long raddr; return do_shmat(shmid,shmaddr,shmflg,&raddr) ?: (long)raddr; } - -asmlinkage long sys_time64(long __user * tloc) -{ - struct timeval now; - int i; - - do_gettimeofday(&now); - i = now.tv_sec; - if (tloc) { - if (put_user(i,tloc)) - i = -EFAULT; - } - return i; -} diff -puN include/asm-x86_64/unistd.h~x86_64-remove-duplicated-sys_time64 include/asm-x86_64/unistd.h --- 25/include/asm-x86_64/unistd.h~x86_64-remove-duplicated-sys_time64 2005-03-30 18:01:57.000000000 -0800 +++ 25-akpm/include/asm-x86_64/unistd.h 2005-03-30 18:01:57.000000000 -0800 @@ -462,7 +462,7 @@ __SYSCALL(__NR_fremovexattr, sys_fremove #define __NR_tkill 200 __SYSCALL(__NR_tkill, sys_tkill) #define __NR_time 201 -__SYSCALL(__NR_time, sys_time64) +__SYSCALL(__NR_time, sys_time) #define __NR_futex 202 __SYSCALL(__NR_futex, sys_futex) #define __NR_sched_setaffinity 203 @@ -600,6 +600,7 @@ do { \ #define __ARCH_WANT_SYS_SIGPENDING #define __ARCH_WANT_SYS_SIGPROCMASK #define __ARCH_WANT_SYS_RT_SIGACTION +#define __ARCH_WANT_SYS_TIME #define __ARCH_WANT_COMPAT_SYS_TIME #endif _