* sysdeps/unix/sysv/linux/adjtime.c: Correctly use

ADJ_OFFSET_SS_READ.
git-mirror · Mar 24, 2008 · e093c24 · e093c24
1 parent 0ab7632
commit e093c24
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git 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
@@ -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: