diff options
author | Jakub Jelinek <jakub@redhat.com> | 2009-04-24 08:00:37 +0000 |
---|---|---|
committer | Jakub Jelinek <jakub@redhat.com> | 2009-04-24 08:00:37 +0000 |
commit | 7dec33c08e4755e72d1280e48e61f0141dfc1da5 (patch) | |
tree | 22aa7aa8ebc1f795e180c8c0d99cdda7d2a3ffef /sysdeps/unix/sysv/linux/sys | |
parent | 335206256c84eaefab082284523e5b8f89fcffb2 (diff) |
Updated to fedora-glibc-20090424T0747cvs/fedora-glibc-2_9_90-20
Diffstat (limited to 'sysdeps/unix/sysv/linux/sys')
-rw-r--r-- | sysdeps/unix/sysv/linux/sys/mount.h | 6 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/sys/timex.h | 14 |
2 files changed, 16 insertions, 4 deletions
diff --git a/sysdeps/unix/sysv/linux/sys/mount.h b/sysdeps/unix/sysv/linux/sys/mount.h index b30554987a..57d440f273 100644 --- a/sysdeps/unix/sysv/linux/sys/mount.h +++ b/sysdeps/unix/sysv/linux/sys/mount.h @@ -96,8 +96,12 @@ enum /* Possible value for FLAGS parameter of `umount2'. */ enum { - MNT_FORCE = 1 /* Force unmounting. */ + MNT_FORCE = 1, /* Force unmounting. */ #define MNT_FORCE MNT_FORCE + MNT_DETACH = 2, /* Just detach from the tree. */ +#define MNT_DETACH MNT_DETACH + MNT_EXPIRE = 4 /* Mark for expiry. */ +#define MNT_EXPIRE MNT_EXPIRE }; diff --git a/sysdeps/unix/sysv/linux/sys/timex.h b/sysdeps/unix/sysv/linux/sys/timex.h index f7bd6e7929..5f10c7fa4c 100644 --- a/sysdeps/unix/sysv/linux/sys/timex.h +++ b/sysdeps/unix/sysv/linux/sys/timex.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1995, 1996, 1997, 1999, 2007 Free Software Foundation, Inc. +/* Copyright (C) 1995-1997, 1999, 2007, 2009 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -22,7 +22,7 @@ #include <features.h> #include <sys/time.h> -/* These definitions from linux/timex.h as of 2.2.0. */ +/* These definitions from linux/timex.h as of 2.6.30. */ struct ntptimeval { @@ -54,10 +54,12 @@ struct timex long int errcnt; /* calibration errors (ro) */ long int stbcnt; /* stability limit exceeded (ro) */ + int tai; /* TAI offset (ro) */ + /* ??? */ int :32; int :32; int :32; int :32; int :32; int :32; int :32; int :32; - int :32; int :32; int :32; int :32; + int :32; int :32; int :32; }; /* Mode codes (timex.mode) */ @@ -67,6 +69,9 @@ struct timex #define ADJ_ESTERROR 0x0008 /* estimated time error */ #define ADJ_STATUS 0x0010 /* clock status */ #define ADJ_TIMECONST 0x0020 /* pll time constant */ +#define ADJ_TAI 0x0080 /* set TAI offset */ +#define ADJ_MICRO 0x1000 /* select microsecond resolution */ +#define ADJ_NANO 0x2000 /* select nanosecond resolution */ #define ADJ_TICK 0x4000 /* tick value */ #define ADJ_OFFSET_SINGLESHOT 0x8001 /* old-fashioned adjtime */ #define ADJ_OFFSET_SS_READ 0xa001 /* read-only adjtime */ @@ -99,6 +104,9 @@ struct timex #define STA_PPSERROR 0x0800 /* PPS signal calibration error (ro) */ #define STA_CLOCKERR 0x1000 /* clock hardware fault (ro) */ +#define STA_NANO 0x2000 /* resolution (0 = us, 1 = ns) (ro) */ +#define STA_MODE 0x4000 /* mode (0 = PLL, 1 = FLL) (ro) */ +#define STA_CLK 0x8000 /* clock source (0 = A, 1 = B) (ro) */ #define STA_RONLY (STA_PPSSIGNAL | STA_PPSJITTER | STA_PPSWANDER | \ STA_PPSERROR | STA_CLOCKERR) /* read-only bits */ |