diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/adjtime.c | 22 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/kernel-features.h | 3 |
3 files changed, 10 insertions, 23 deletions
diff --git a/ChangeLog b/ChangeLog index fbbd5d2689..a87a2d0d01 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2014-06-20 Joseph Myers <joseph@codesourcery.com> + + * sysdeps/unix/sysv/linux/kernel-features.h + (__ASSUME_ADJ_OFFSET_SS_READ): Remove macro. + * sysdeps/unix/sysv/linux/adjtime.c (ADJTIME) + [ADJ_OFFSET_SS_READ]: Make code unconditional. + (ADJTIME) [!ADJ_OFFSET_SS_READ]: Remove conditional code. + 2014-06-20 Maciej W. Rozycki <macro@codesourcery.com> [BZ #17075] diff --git a/sysdeps/unix/sysv/linux/adjtime.c b/sysdeps/unix/sysv/linux/adjtime.c index be49911eeb..ef31cc5c61 100644 --- a/sysdeps/unix/sysv/linux/adjtime.c +++ b/sysdeps/unix/sysv/linux/adjtime.c @@ -72,28 +72,10 @@ ADJTIME (const struct TIMEVAL *itv, struct TIMEVAL *otv) tntx.modes = ADJ_OFFSET_SINGLESHOT; } else - { -#ifdef ADJ_OFFSET_SS_READ - tntx.modes = ADJ_OFFSET_SS_READ; -#else - tntx.modes = 0; -#endif - } + tntx.modes = ADJ_OFFSET_SS_READ; -#if defined ADJ_OFFSET_SS_READ && !defined __ASSUME_ADJ_OFFSET_SS_READ - again: -#endif if (__glibc_unlikely (ADJTIMEX (&tntx) < 0)) - { -#if defined ADJ_OFFSET_SS_READ && !defined __ASSUME_ADJ_OFFSET_SS_READ - if (itv && errno == EINVAL && tntx.modes == ADJ_OFFSET_SS_READ) - { - tntx.modes = ADJ_OFFSET_SINGLESHOT; - goto again; - } -#endif - return -1; - } + return -1; if (otv) { diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h index 026f89fbc5..d0673211ad 100644 --- a/sysdeps/unix/sysv/linux/kernel-features.h +++ b/sysdeps/unix/sysv/linux/kernel-features.h @@ -120,9 +120,6 @@ 2.6.23. */ #define __ASSUME_O_CLOEXEC 1 -/* Support for ADJ_OFFSET_SS_READ was added in 2.6.24. */ -#define __ASSUME_ADJ_OFFSET_SS_READ 1 - /* Support for various CLOEXEC and NONBLOCK flags was added in 2.6.27. */ #define __ASSUME_SOCK_CLOEXEC 1 |