diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/clock_settime.c | 9 |
2 files changed, 3 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog index 1dc4798eb0..5a33871ccf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2014-12-26 Chris Metcalf <cmetcalf@ezchip.com> + * sysdeps/unix/sysv/linux/clock_settime.c (SYSDEP_SETTIME): Remove + definitions of INTERNAL_VSYSCALL and INLINE_VSYSCALL. + * sysdeps/unix/sysv/linux/tile/sysdep.h (HAVE_CLOCK_GETTIME_VSYSCALL): Move definition out of assembly-specific section to avoid a redefinition warning. diff --git a/sysdeps/unix/sysv/linux/clock_settime.c b/sysdeps/unix/sysv/linux/clock_settime.c index 0448bfef69..e8555b4316 100644 --- a/sysdeps/unix/sysv/linux/clock_settime.c +++ b/sysdeps/unix/sysv/linux/clock_settime.c @@ -21,15 +21,6 @@ #include "kernel-posix-cpu-timers.h" -#ifndef HAVE_CLOCK_GETRES_VSYSCALL -# undef INTERNAL_VSYSCALL -# define INTERNAL_VSYSCALL INTERNAL_SYSCALL -# undef INLINE_VSYSCALL -# define INLINE_VSYSCALL INLINE_SYSCALL -#else -# include <bits/libc-vdso.h> -#endif - /* The REALTIME clock is definitely supported in the kernel. */ #define SYSDEP_SETTIME \ |