diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2008-03-24 16:11:32 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2008-03-24 16:11:32 +0000 |
| commit | e093c247439d8d91ec1bf17f4406efe491563d4b (patch) | |
| tree | fea3ae2e56240d6a9e883fd1372c4023718fa4c1 | |
| parent | 0ab7632d38f52e2a540b3550f69ec0ed293c0cdb (diff) | |
| download | glibc-e093c247439d8d91ec1bf17f4406efe491563d4b.tar.gz glibc-e093c247439d8d91ec1bf17f4406efe491563d4b.tar.xz glibc-e093c247439d8d91ec1bf17f4406efe491563d4b.zip | |
* sysdeps/unix/sysv/linux/adjtime.c: Correctly use
ADJ_OFFSET_SS_READ.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/adjtime.c | 10 |
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 88c953de54..16c2e1690a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2008-03-24 Ulrich Drepper <drepper@redhat.com> + * 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 202bb14485..ebd2149705 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: |