Messages in this thread Patch in this message | | | Date | Sun, 6 Dec 2009 11:02:20 +0100 (CET) | From | Thomas Gleixner <> | Subject | [GIT pull] timers ntp updates for 2.6.33 |
| |
Linus,
Please pull the latest timers-for-linus-ntp git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git timers-for-linus-ntp
Thanks,
tglx
------------------> John Stultz (1): ntp: Provide compability defines (You say MOD_NANO, I say ADJ_NANO)
include/linux/timex.h | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/include/linux/timex.h b/include/linux/timex.h index e6967d1..782ccd4 100644 --- a/include/linux/timex.h +++ b/include/linux/timex.h @@ -115,13 +115,16 @@ struct timex { #define ADJ_OFFSET_SS_READ 0xa001 /* read-only adjtime */ #endif -/* xntp 3.4 compatibility names */ +/* NTP userland likes the MOD_ prefix better */ #define MOD_OFFSET ADJ_OFFSET #define MOD_FREQUENCY ADJ_FREQUENCY #define MOD_MAXERROR ADJ_MAXERROR #define MOD_ESTERROR ADJ_ESTERROR #define MOD_STATUS ADJ_STATUS #define MOD_TIMECONST ADJ_TIMECONST +#define MOD_TAI ADJ_TAI +#define MOD_MICRO ADJ_MICRO +#define MOD_NANO ADJ_NANO /*
| |