From 7bb1b2c96e8a047633f2a755d23141e6566612d2 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 1 Aug 2006 07:16:26 +0000 Subject: [PATCH] * sysdeps/unix/sysv/linux/Versions: Finally add add_key, request_key, and keyctl back. --- ChangeLog | 5 +++ nptl/ChangeLog | 7 +++++ nptl/sysdeps/unix/sysv/linux/i386/smp.h | 56 +++++++++++++++++++++++++++++++++ sysdeps/unix/sysv/linux/Versions | 2 ++ 4 files changed, 70 insertions(+) create mode 100644 nptl/sysdeps/unix/sysv/linux/i386/smp.h diff --git a/ChangeLog b/ChangeLog index 52613d0..ec5eb67 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-08-01 Ulrich Drepper + + * sysdeps/unix/sysv/linux/Versions: Finally add add_key, + request_key, and keyctl back. + 2006-07-31 Ulrich Drepper * sysdeps/unix/sysv/linux/dl-osinfo.h: Remove unnecessary include. diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 070bf0d..3e4008b 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,10 @@ +2006-08-01 Ulrich Drepper + + * sysdeps/unix/sysv/linux/i386/smp.h: New file. Old Linux-specific + file. Don't use sysctl. + * sysdeps/unix/sysv/linux/smp.h: Always assume SMP. Archs can + overwrite the file if this is likely not true. + 2006-07-31 Daniel Jacobowitz * allocatestack.c (__reclaim_stacks): Reset the PID on cached stacks. diff --git a/nptl/sysdeps/unix/sysv/linux/i386/smp.h b/nptl/sysdeps/unix/sysv/linux/i386/smp.h new file mode 100644 index 0000000..cb24c9e --- /dev/null +++ b/nptl/sysdeps/unix/sysv/linux/i386/smp.h @@ -0,0 +1,56 @@ +/* Determine whether the host has multiple processors. Linux version. + Copyright (C) 1996, 2002, 2004, 2006 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 + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include +#include +#include +#include +#include + +/* Test whether the machine has more than one processor. This is not the + best test but good enough. More complicated tests would require `malloc' + which is not available at that time. */ +static inline int +is_smp_system (void) +{ + union + { + struct utsname uts; + char buf[512]; + }; + char *cp; + + /* Try reading the number using `sysctl' first. */ + if (uname (&uts) == 0) + cp = 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); + if (__builtin_expect (fd, 0) == -1 + || (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_not_cancel_no_status (fd); + cp = buf; + } + + return strstr (cp, "SMP") != NULL; +} diff --git a/sysdeps/unix/sysv/linux/Versions b/sysdeps/unix/sysv/linux/Versions index 7c015b1..e1e6e61 100644 --- a/sysdeps/unix/sysv/linux/Versions +++ b/sysdeps/unix/sysv/linux/Versions @@ -125,6 +125,8 @@ libc { } GLIBC_2.5 { splice; sync_file_range; tee; vmsplice; + + add_key; request_key; keyctl; } GLIBC_PRIVATE { # functions used in other libraries -- 2.7.4