From e093c247439d8d91ec1bf17f4406efe491563d4b Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 24 Mar 2008 16:11:32 +0000 Subject: [PATCH] * sysdeps/unix/sysv/linux/adjtime.c: Correctly use ADJ_OFFSET_SS_READ. --- ChangeLog | 3 +++ sysdeps/unix/sysv/linux/adjtime.c | 10 ++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 88c953d..16c2e16 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2008-03-24 Ulrich Drepper + * sysdeps/unix/sysv/linux/adjtime.c: Correctly use + ADJ_OFFSET_SS_READ. + * sysdeps/unix/sysv/linux/bits/sched.h: Add new CLONE_* flags, remove CLONE_STOPPED. diff --git a/sysdeps/unix/sysv/linux/adjtime.c b/sysdeps/unix/sysv/linux/adjtime.c index 202bb14..ebd2149 100644 --- a/sysdeps/unix/sysv/linux/adjtime.c +++ b/sysdeps/unix/sysv/linux/adjtime.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995, 1996, 1997, 1998, 2002, 2004, 2007 +/* Copyright (C) 1995, 1996, 1997, 1998, 2002, 2004, 2007, 2008 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -71,14 +71,16 @@ ADJTIME (const struct TIMEVAL *itv, struct TIMEVAL *otv) return -1; } tntx.offset = tmp.tv_usec + tmp.tv_sec * 1000000L; + tntx.modes = ADJ_OFFSET_SINGLESHOT; + } + else + { #ifdef ADJ_OFFSET_SS_READ tntx.modes = ADJ_OFFSET_SS_READ; #else - tntx.modes = ADJ_OFFSET_SINGLESHOT; + tntx.modes = 0; #endif } - else - tntx.modes = 0; #if defined ADJ_OFFSET_SS_READ && !defined __ASSUME_ADJ_OFFSET_SS_READ again: -- 2.7.4