Update timex.h for ADJ_SETOFFSET.

ADJ_SETOFFSET is a new adjtimex() mode that can be used to precisely
step the clock. It was introduced in kernel 2.6.39.

diff --git a/ChangeLog b/ChangeLog
index 5ea4c4f9f92a15f510fa8843651fe9da04e094da..e6db8ef0badecb54947668f79e340acf5092cfaa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-02-24  Miroslav Lichvar  <mlichvar@redhat.com>
+
+       * sysdeps/unix/sysv/linux/bits/timex.h: Update version.
+       (struct timex): Update time comment.
+       (ADJ_SETOFFSET): Define.
+
 2015-02-24  Joseph Myers  <joseph@codesourcery.com>
 
        [BZ #18019]

diff --git a/sysdeps/unix/sysv/linux/bits/timex.h b/sysdeps/unix/sysv/linux/bits/timex.h
index d13948ba7e64297a1189a4dde3bc6ecb4787649e..ecefc76ce4d35cf96ec997688d6fa3b994996450 100644 (file)
--- a/sysdeps/unix/sysv/linux/bits/timex.h
+++ b/sysdeps/unix/sysv/linux/bits/timex.h
@@ -20,7 +20,7 @@
 
 #include <bits/types.h>
 
-/* These definitions from linux/timex.h as of 2.6.30.  */
+/* These definitions from linux/timex.h as of 3.18.  */
 
 struct timex
 {
@@ -33,7 +33,7 @@ struct timex
   __syscall_slong_t constant;  /* pll time constant */
   __syscall_slong_t precision; /* clock precision (usec) (ro) */
   __syscall_slong_t tolerance; /* clock frequency tolerance (ppm) (ro) */
-  struct timeval time;         /* (read only) */
+  struct timeval time;         /* (read only, except for ADJ_SETOFFSET) */
   __syscall_slong_t tick;      /* (modified) usecs between clock ticks */
   __syscall_slong_t ppsfreq;   /* pps frequency (scaled ppm) (ro) */
   __syscall_slong_t jitter;    /* pps jitter (us) (ro) */
@@ -60,6 +60,7 @@ struct timex
 #define ADJ_STATUS             0x0010  /* clock status */
 #define ADJ_TIMECONST          0x0020  /* pll time constant */
 #define ADJ_TAI                        0x0080  /* set TAI offset */
+#define ADJ_SETOFFSET          0x0100  /* add 'time' to current time */
 #define ADJ_MICRO              0x1000  /* select microsecond resolution */
 #define ADJ_NANO               0x2000  /* select nanosecond resolution */
 #define ADJ_TICK               0x4000  /* tick value */