diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 15:19:34 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 15:20:08 +0000 |
| commit | 72b2e72dc0f0bcc64f3a91f1e1d5986c186b7880 (patch) | |
| tree | f9e635b447789995362b8aca162ad6d855bb28c2 /sysdeps/unix/sysv/linux/i386/smp.h | |
| parent | 2838aa1289bec5055c33d2c00bfe6e3ed3d52e0f (diff) | |
| parent | 9f9bd6ac848e9acee2c1072cdb14955c1abb8725 (diff) | |
Merge commit 'refs/top-bases/t/UTIME' into t/UTIME
Diffstat (limited to 'sysdeps/unix/sysv/linux/i386/smp.h')
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/smp.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sysdeps/unix/sysv/linux/i386/smp.h b/sysdeps/unix/sysv/linux/i386/smp.h index c0ec72159d..5457bb27d3 100644 --- a/sysdeps/unix/sysv/linux/i386/smp.h +++ b/sysdeps/unix/sysv/linux/i386/smp.h @@ -1,5 +1,5 @@ /* Determine whether the host has multiple processors. Linux version. - Copyright (C) 1996-2016 Free Software Foundation, Inc. + Copyright (C) 1996-2018 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 @@ -36,18 +36,18 @@ is_smp_system (void) char *cp; /* Try reading the number using `sysctl' first. */ - if (uname (&u.uts) == 0) + if (__uname (&u.uts) == 0) cp = u.uts.version; else { /* This was not successful. Now try reading the /proc filesystem. */ - int fd = open_not_cancel_2 ("/proc/sys/kernel/version", O_RDONLY); + int fd = __open64_nocancel ("/proc/sys/kernel/version", O_RDONLY); if (__builtin_expect (fd, 0) == -1 - || read_not_cancel (fd, u.buf, sizeof (u.buf)) <= 0) + || __read_nocancel (fd, u.buf, sizeof (u.buf)) <= 0) /* This also didn't work. We give up and say it's a UP machine. */ u.buf[0] = '\0'; - close_not_cancel_no_status (fd); + __close_nocancel_nostatus (fd); cp = u.buf; } |