Inter-revision diff: patch 2

Comparing v8 (message) to v9 (message)

--- v8
+++ v9
@@ -8,7 +8,7 @@
  2 files changed, 13 insertions(+), 1 deletions(-)
 
 diff --git a/include/linux/timex.h b/include/linux/timex.h
-index 32d852f..82d4b24 100644
+index 32d852f..800a2c8 100644
 --- a/include/linux/timex.h
 +++ b/include/linux/timex.h
 @@ -73,7 +73,7 @@ struct timex {
@@ -20,14 +20,14 @@
  	long tick;		/* (modified) usecs between clock ticks */
  
  	long ppsfreq;           /* pps frequency (scaled ppm) (ro) */
-@@ -101,6 +101,7 @@ struct timex {
- #define ADJ_ESTERROR		0x0008	/* estimated time error */
+@@ -102,6 +102,7 @@ struct timex {
  #define ADJ_STATUS		0x0010	/* clock status */
  #define ADJ_TIMECONST		0x0020	/* pll time constant */
-+#define ADJ_SETOFFSET		0x0040  /* add 'time' to current time */
  #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 */
 diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
 index d232189..0c87858 100644
 --- a/kernel/time/ntp.c
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help