diff options
Diffstat (limited to 'include/linux/timex.h')
| -rw-r--r-- | include/linux/timex.h | 11 | 
1 files changed, 9 insertions, 2 deletions
diff --git a/include/linux/timex.h b/include/linux/timex.h index fc6035d29d5..9007313b5b7 100644 --- a/include/linux/timex.h +++ b/include/linux/timex.h @@ -82,7 +82,7 @@   */  #define SHIFT_USEC 16		/* frequency offset scale (shift) */  #define PPM_SCALE (NSEC_PER_USEC << (NTP_SCALE_SHIFT - SHIFT_USEC)) -#define PPM_SCALE_INV_SHIFT 20 +#define PPM_SCALE_INV_SHIFT 19  #define PPM_SCALE_INV ((1ll << (PPM_SCALE_INV_SHIFT + NTP_SCALE_SHIFT)) / \  		       PPM_SCALE + 1) @@ -141,8 +141,15 @@ struct timex {  #define ADJ_MICRO		0x1000	/* select microsecond resolution */  #define ADJ_NANO		0x2000	/* select nanosecond resolution */  #define ADJ_TICK		0x4000	/* tick value */ + +#ifdef __KERNEL__ +#define ADJ_ADJTIME		0x8000	/* switch between adjtime/adjtimex modes */ +#define ADJ_OFFSET_SINGLESHOT	0x0001	/* old-fashioned adjtime */ +#define ADJ_OFFSET_READONLY	0x2000	/* read-only adjtime */ +#else  #define ADJ_OFFSET_SINGLESHOT	0x8001	/* old-fashioned adjtime */ -#define ADJ_OFFSET_SS_READ	0xa001  /* read-only adjtime */ +#define ADJ_OFFSET_SS_READ	0xa001	/* read-only adjtime */ +#endif  /* xntp 3.4 compatibility names */  #define MOD_OFFSET	ADJ_OFFSET  |