aboutsummaryrefslogtreecommitdiff
path: root/nptl
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-10-24 23:02:46 +0000
committerUlrich Drepper <drepper@redhat.com>2004-10-24 23:02:46 +0000
commit78d8d2117bcb9b5926a2af189bdf4bced4deb982 (patch)
treeddeec0fe0916bc5a66a9a55c67e5532730382021 /nptl
parentb31b32b3aa92bfe3184eece0ef108181de52f06c (diff)
downloadglibc-78d8d2117bcb9b5926a2af189bdf4bced4deb982.zip
glibc-78d8d2117bcb9b5926a2af189bdf4bced4deb982.tar.gz
glibc-78d8d2117bcb9b5926a2af189bdf4bced4deb982.tar.bz2
Update.
* resolv/nss_dns/dns-host.c: Avoid using PLTs.
Diffstat (limited to 'nptl')
-rw-r--r--nptl/ChangeLog5
-rw-r--r--nptl/sysdeps/unix/sysv/linux/smp.h7
2 files changed, 9 insertions, 3 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 1e66f8f..3d6bd03 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-24 Ulrich Drepper <drepper@redhat.com>
+
+ * sysdeps/unix/sysv/linux/smp.h (is_smp_system): Use
+ not-cancelable I/O functions.
+
2004-10-21 Kaz Kojima <kkojima@rr.iij4u.or.jp>
* sysdeps/unix/sysv/linux/sh/lowlevellock.S
diff --git a/nptl/sysdeps/unix/sysv/linux/smp.h b/nptl/sysdeps/unix/sysv/linux/smp.h
index 718fab6..c1160a7 100644
--- a/nptl/sysdeps/unix/sysv/linux/smp.h
+++ b/nptl/sysdeps/unix/sysv/linux/smp.h
@@ -20,6 +20,7 @@
#include <fcntl.h>
#include <string.h>
#include <sys/sysctl.h>
+#include <not-cancel.h>
/* Test whether the machine has more than one processor. This is not the
best test but good enough. More complicated tests would require `malloc'
@@ -37,13 +38,13 @@ is_smp_system (void)
buf, &reslen, NULL, 0) < 0)
{
/* This was not successful. Now try reading the /proc filesystem. */
- int fd = __open ("/proc/sys/kernel/version", O_RDONLY);
+ int fd = open_not_cancel_2 ("/proc/sys/kernel/version", O_RDONLY);
if (__builtin_expect (fd, 0) == -1
- || (reslen = __read (fd, buf, sizeof (buf))) <= 0)
+ || (reslen = read_not_cancel (fd, buf, sizeof (buf))) <= 0)
/* This also didn't work. We give up and say it's a UP machine. */
buf[0] = '\0';
- __close (fd);
+ close_not_cancel_no_status (fd);
}
return strstr (buf, "SMP") != NULL;