aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2005-07-12 21:38:07 +0000
committerUlrich Drepper <drepper@redhat.com>2005-07-12 21:38:07 +0000
commit9d653cd1893cdd0a073b8aef3f2d8f7626d778df (patch)
tree2b15378d1198ebf9d29ff243fccdc32883e6ca32
parentd1abd625de922d76d62ea9da91b71f48b6db53c0 (diff)
downloadglibc-9d653cd1893cdd0a073b8aef3f2d8f7626d778df.tar
glibc-9d653cd1893cdd0a073b8aef3f2d8f7626d778df.tar.gz
glibc-9d653cd1893cdd0a073b8aef3f2d8f7626d778df.tar.bz2
glibc-9d653cd1893cdd0a073b8aef3f2d8f7626d778df.zip
* 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--ChangeLog4
-rw-r--r--sysdeps/unix/sysv/linux/ia64/has_cpuclock.c12
2 files changed, 10 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 9e4d6f68b8..069b14084c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2005-07-12 Jakub Jelinek <jakub@redhat.com>
+ * 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.
+
* sysdeps/s390/s390-64/bcopy.S (__bcopy): Use
HIDDEN_BUILTIN_JUMPTARGET to jump to memmove.
diff --git a/sysdeps/unix/sysv/linux/ia64/has_cpuclock.c b/sysdeps/unix/sysv/linux/ia64/has_cpuclock.c
index ee19161272..39511cd2c5 100644
--- a/sysdeps/unix/sysv/linux/ia64/has_cpuclock.c
+++ b/sysdeps/unix/sysv/linux/ia64/has_cpuclock.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2001, 2003, 2004, 2005 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
@@ -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;