diff options
author | Roland McGrath <roland@gnu.org> | 2005-07-18 03:36:50 +0000 |
---|---|---|
committer | Roland McGrath <roland@gnu.org> | 2005-07-18 03:36:50 +0000 |
commit | 6afb0e179384371d6a485f9e8a2a6d4c98f41daa (patch) | |
tree | d8e468f8793ecd924d12fba89888c5b20f1dd1e0 | |
parent | 664b64b8b3abb25b1bd06556393baf7e16a36d20 (diff) |
2005-07-12 Jakub Jelinek <jakub@redhat.com>
[BZ #1106]
* sysdeps/unix/sysv/linux/ia64/has_cpuclock.c: Include not-cancel.h.
(has_cpuclock): Use open_not_cancel_2 instead of open, read_not_cancel
instead of read and close_not_cancel_no_status instead of close.
-rw-r--r-- | sysdeps/unix/sysv/linux/ia64/has_cpuclock.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sysdeps/unix/sysv/linux/ia64/has_cpuclock.c b/sysdeps/unix/sysv/linux/ia64/has_cpuclock.c index ee19161272..883508a562 100644 --- a/sysdeps/unix/sysv/linux/ia64/has_cpuclock.c +++ b/sysdeps/unix/sysv/linux/ia64/has_cpuclock.c @@ -21,7 +21,7 @@ #include <unistd.h> #include <sys/stat.h> #include <sys/types.h> - +#include <not-cancel.h> static int itc_usable; @@ -31,18 +31,18 @@ has_cpuclock (void) if (__builtin_expect (itc_usable == 0, 0)) { int newval = 1; - int fd = open ("/proc/sal/itc_drift", O_RDONLY); + int fd = open_not_cancel_2 ("/proc/sal/itc_drift", O_RDONLY); if (__builtin_expect (fd != -1, 1)) { char buf[16]; /* We expect the file to contain a single digit followed by a newline. If the format changes we better not rely on the file content. */ - if (read (fd, buf, sizeof buf) != 2 || buf[0] != '0' - || buf[1] != '\n') + if (read_not_cancel (fd, buf, sizeof buf) != 2 + || buf[0] != '0' || buf[1] != '\n') newval = -1; - close (fd); + close_not_cancel_no_status (fd); } itc_usable = newval; |