r1767 - in glibc-package: branches/glibc-2.4/debian branches/glibc-2.4/debian/patches branches/glibc-2.4/debian/patches/any trunk/debian trunk/debian/patches trunk/debian/patches/any
Author: aurel32
Date: 2006-08-22 20:18:44 +0000 (Tue, 22 Aug 2006)
New Revision: 1767
Added:
glibc-package/branches/glibc-2.4/debian/patches/any/cvs-sysctl.diff
glibc-package/trunk/debian/patches/any/cvs-sysctl.diff
Modified:
glibc-package/branches/glibc-2.4/debian/changelog
glibc-package/branches/glibc-2.4/debian/patches/any/local-sysctl.diff
glibc-package/branches/glibc-2.4/debian/patches/series
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/any/local-sysctl.diff
glibc-package/trunk/debian/patches/series
Log:
* patches/any/cvs-sysctl.diff: patch from upstream to fix the sysctl()
problem for NPTL.
* patches/any/local-sysctl.diff: remove the NPTL fix from this patch, apply
the same kind of fix for linuxthreads than for NPTL. (Closes: #383976).
Modified: glibc-package/branches/glibc-2.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.4/debian/changelog 2006-08-20 15:00:06 UTC (rev 1766)
+++ glibc-package/branches/glibc-2.4/debian/changelog 2006-08-22 20:18:44 UTC (rev 1767)
@@ -144,6 +144,10 @@
glibc (2.3.6.ds1-3) UNRELEASED; urgency=low
+ * patches/any/cvs-sysctl.diff: patch from upstream to fix the sysctl()
+ problem for NPTL.
+ * patches/any/local-sysctl.diff: remove the NPTL fix from this patch, apply
+ the same kind of fix for linuxthreads than for NPTL. (Closes: #383976).
* patches/any/local-sysctl.diff: fix for arm.
* patches/any/local-bashisms.diff: fix bashisms in the testsuite.
Added: glibc-package/branches/glibc-2.4/debian/patches/any/cvs-sysctl.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/any/cvs-sysctl.diff 2006-08-20 15:00:06 UTC (rev 1766)
+++ glibc-package/branches/glibc-2.4/debian/patches/any/cvs-sysctl.diff 2006-08-22 20:18:44 UTC (rev 1767)
@@ -0,0 +1,119 @@
+2006-08-01 Ulrich Drepper <drepper@redhat.com>
+
+ * 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.
+
+===================================================================
+RCS file: /cvs/glibc/libc/nptl/sysdeps/unix/sysv/linux/smp.h,v
+retrieving revision 1.3
+retrieving revision 1.4
+diff -u -r1.3 -r1.4
+--- libc/nptl/sysdeps/unix/sysv/linux/smp.h 2004/11/03 20:31:12 1.3
++++ libc/nptl/sysdeps/unix/sysv/linux/smp.h 2006/08/02 04:43:48 1.4
+@@ -1,5 +1,5 @@
+ /* Determine whether the host has multiple processors. Linux version.
+- Copyright (C) 1996, 2002, 2004 Free Software Foundation, Inc.
++ 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
+@@ -17,36 +17,12 @@
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+-#include <errno.h>
+-#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'
+ which is not available at that time. */
+ static inline int
+ is_smp_system (void)
+ {
+- static const int sysctl_args[] = { CTL_KERN, KERN_VERSION };
+- char buf[512];
+- size_t reslen = sizeof (buf);
+-
+- /* Try reading the number using `sysctl' first. */
+- if (__sysctl ((int *) sysctl_args,
+- sizeof (sysctl_args) / sizeof (sysctl_args[0]),
+- buf, &reslen, NULL, 0) < 0)
+- {
+- /* 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);
+- }
+-
+- return strstr (buf, "SMP") != NULL;
++ /* Assume all machines are SMP and/or CMT and/or SMT. */
++ return 1;
+ }
+--- libc/nptl/sysdeps/unix/sysv/linux/i386/smp.h 2004/11/03 20:31:12
++++ libc/nptl/sysdeps/unix/sysv/linux/i386/smp.h 2006/08/02 04:43:48
+@@ -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 <errno.h>
++#include <fcntl.h>
++#include <string.h>
++#include <sys/utsname.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'
++ which is not available at that time. */
++static inline int
++is_smp_system (void)
++{
++ union
++ {
++ struct utsname uts;
++ char buf[512];
++ } u;
++ char *cp;
++
++ /* Try reading the number using `sysctl' first. */
++ 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);
++ if (__builtin_expect (fd, 0) == -1
++ || read_not_cancel (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);
++ cp = u.buf;
++ }
++
++ return strstr (cp, "SMP") != NULL;
++}
Modified: glibc-package/branches/glibc-2.4/debian/patches/any/local-sysctl.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/any/local-sysctl.diff 2006-08-20 15:00:06 UTC (rev 1766)
+++ glibc-package/branches/glibc-2.4/debian/patches/any/local-sysctl.diff 2006-08-22 20:18:44 UTC (rev 1767)
@@ -1,14 +1,14 @@
diff -Nurd glibc-2.3.6.orig/linuxthreads/sysdeps/unix/sysv/linux/smp.h glibc-2.3.6/linuxthreads/sysdeps/unix/sysv/linux/smp.h
--- glibc-2.3.6.orig/linuxthreads/sysdeps/unix/sysv/linux/smp.h 2002-09-08 22:37:11.000000000 +0200
+++ glibc-2.3.6/linuxthreads/sysdeps/unix/sysv/linux/smp.h 2006-08-14 21:59:40.527190466 +0200
-@@ -25,24 +25,17 @@
+@@ -25,24 +25,6 @@
static inline int
is_smp_system (void)
{
- static const int sysctl_args[] = { CTL_KERN, KERN_VERSION };
- char buf[512];
- size_t reslen = sizeof (buf);
-
+- char buf[512];
+- size_t reslen = sizeof (buf);
+-
- /* Try reading the number using `sysctl' first. */
- if (__sysctl ((int *) sysctl_args,
- sizeof (sysctl_args) / sizeof (sysctl_args[0]),
@@ -20,54 +20,14 @@
- || (reslen = __read (fd, buf, sizeof (buf))) <= 0)
- /* This also didn't work. We give up and say it's a UP machine. */
- buf[0] = '\0';
-+ /* Try reading the /proc filesystem first. */
-+ int fd = __open ("/proc/sys/kernel/version", O_RDONLY);
-+ if (__builtin_expect (fd, 0) == -1
-+ || (reslen = __read (fd, buf, sizeof (buf))) <= 0)
-+ /* This didn't work. We give up and say it's a UP machine. */
-+ buf[0] = '\0';
-
+-
- __close (fd);
- }
-+ __close (fd);
-
- return strstr (buf, "SMP") != NULL;
+-
+- return strstr (buf, "SMP") != NULL;
++ /* Assume all machines are SMP and/or CMT and/or SMT. */
++ return 1;
}
-diff -Nurd glibc-2.3.6.orig/nptl/sysdeps/unix/sysv/linux/smp.h glibc-2.3.6/nptl/sysdeps/unix/sysv/linux/smp.h
---- glibc-2.3.6.orig/nptl/sysdeps/unix/sysv/linux/smp.h 2004-11-03 21:31:12.000000000 +0100
-+++ glibc-2.3.6/nptl/sysdeps/unix/sysv/linux/smp.h 2006-08-14 21:57:52.353875675 +0200
-@@ -29,24 +29,17 @@
- static inline int
- is_smp_system (void)
- {
-- static const int sysctl_args[] = { CTL_KERN, KERN_VERSION };
- char buf[512];
- size_t reslen = sizeof (buf);
-
-- /* Try reading the number using `sysctl' first. */
-- if (__sysctl ((int *) sysctl_args,
-- sizeof (sysctl_args) / sizeof (sysctl_args[0]),
-- buf, &reslen, NULL, 0) < 0)
-- {
-- /* 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';
-+ /* Try reading the /proc filesystem first. */
-+ 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 didn't work. We give up and say it's a UP machine. */
-+ buf[0] = '\0';
-
-- close_not_cancel_no_status (fd);
-- }
-+ close_not_cancel_no_status (fd);
-
- return strstr (buf, "SMP") != NULL;
- }
diff -Nurd glibc-2.3.6.orig/sysdeps/unix/sysv/linux/sysctl.c glibc-2.3.6/sysdeps/unix/sysv/linux/sysctl.c
--- glibc-2.3.6.orig/sysdeps/unix/sysv/linux/sysctl.c 2005-07-18 05:37:20.000000000 +0200
+++ glibc-2.3.6/sysdeps/unix/sysv/linux/sysctl.c 2006-08-14 22:12:28.454345256 +0200
@@ -75,7 +35,7 @@
}
libc_hidden_def (__sysctl)
weak_alias (__sysctl, sysctl)
-+link_warning (__sysctl, "the `sysctl' syscall has been removed from 2.6.18+ kernels, direct access to `/proc/sys' should be used instead.")
++link_warning (sysctl, "the `sysctl' syscall has been removed from 2.6.18+ kernels, direct access to `/proc/sys' should be used instead.")
diff -Nurd glibc-2.3.6.orig/ports/sysdeps/unix/sysv/linux/arm/ioperm.c glibc-2.3.6/ports/sysdeps/unix/sysv/linux/arm/ioperm.c
--- glibc-2.3.6.orig/ports/sysdeps/unix/sysv/linux/arm/ioperm.c.orig 2006-08-15 18:23:08.715868260 +0200
+++ glibc-2.3.6/ports/sysdeps/unix/sysv/linux/arm/ioperm.c 2006-08-15 19:30:07.215439365 +0200
Modified: glibc-package/branches/glibc-2.4/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/series 2006-08-20 15:00:06 UTC (rev 1766)
+++ glibc-package/branches/glibc-2.4/debian/patches/series 2006-08-22 20:18:44 UTC (rev 1767)
@@ -99,6 +99,7 @@
any/cvs-getcwd_c.diff -p1
any/cvs-uio_h.diff -p1
+any/cvs-sysctl.diff -p1
any/cvs-thread_signals.diff -p0
any/local-__thread.diff -p0
any/local-asserth-decls.diff -p0
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-08-20 15:00:06 UTC (rev 1766)
+++ glibc-package/trunk/debian/changelog 2006-08-22 20:18:44 UTC (rev 1767)
@@ -1,5 +1,9 @@
glibc (2.3.6.ds1-3) UNRELEASED; urgency=low
+ * patches/any/cvs-sysctl.diff: patch from upstream to fix the sysctl()
+ problem for NPTL.
+ * patches/any/local-sysctl.diff: remove the NPTL fix from this patch, apply
+ the same kind of fix for linuxthreads than for NPTL. (Closes: #383976).
* patches/any/local-sysctl.diff: fix for arm.
* patches/any/local-bashisms.diff: fix bashisms in the testsuite.
Added: glibc-package/trunk/debian/patches/any/cvs-sysctl.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-sysctl.diff 2006-08-20 15:00:06 UTC (rev 1766)
+++ glibc-package/trunk/debian/patches/any/cvs-sysctl.diff 2006-08-22 20:18:44 UTC (rev 1767)
@@ -0,0 +1,119 @@
+2006-08-01 Ulrich Drepper <drepper@redhat.com>
+
+ * 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.
+
+===================================================================
+RCS file: /cvs/glibc/libc/nptl/sysdeps/unix/sysv/linux/smp.h,v
+retrieving revision 1.3
+retrieving revision 1.4
+diff -u -r1.3 -r1.4
+--- libc/nptl/sysdeps/unix/sysv/linux/smp.h 2004/11/03 20:31:12 1.3
++++ libc/nptl/sysdeps/unix/sysv/linux/smp.h 2006/08/02 04:43:48 1.4
+@@ -1,5 +1,5 @@
+ /* Determine whether the host has multiple processors. Linux version.
+- Copyright (C) 1996, 2002, 2004 Free Software Foundation, Inc.
++ 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
+@@ -17,36 +17,12 @@
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+-#include <errno.h>
+-#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'
+ which is not available at that time. */
+ static inline int
+ is_smp_system (void)
+ {
+- static const int sysctl_args[] = { CTL_KERN, KERN_VERSION };
+- char buf[512];
+- size_t reslen = sizeof (buf);
+-
+- /* Try reading the number using `sysctl' first. */
+- if (__sysctl ((int *) sysctl_args,
+- sizeof (sysctl_args) / sizeof (sysctl_args[0]),
+- buf, &reslen, NULL, 0) < 0)
+- {
+- /* 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);
+- }
+-
+- return strstr (buf, "SMP") != NULL;
++ /* Assume all machines are SMP and/or CMT and/or SMT. */
++ return 1;
+ }
+--- libc/nptl/sysdeps/unix/sysv/linux/i386/smp.h 2004/11/03 20:31:12
++++ libc/nptl/sysdeps/unix/sysv/linux/i386/smp.h 2006/08/02 04:43:48
+@@ -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 <errno.h>
++#include <fcntl.h>
++#include <string.h>
++#include <sys/utsname.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'
++ which is not available at that time. */
++static inline int
++is_smp_system (void)
++{
++ union
++ {
++ struct utsname uts;
++ char buf[512];
++ } u;
++ char *cp;
++
++ /* Try reading the number using `sysctl' first. */
++ 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);
++ if (__builtin_expect (fd, 0) == -1
++ || read_not_cancel (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);
++ cp = u.buf;
++ }
++
++ return strstr (cp, "SMP") != NULL;
++}
Modified: glibc-package/trunk/debian/patches/any/local-sysctl.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/local-sysctl.diff 2006-08-20 15:00:06 UTC (rev 1766)
+++ glibc-package/trunk/debian/patches/any/local-sysctl.diff 2006-08-22 20:18:44 UTC (rev 1767)
@@ -1,14 +1,14 @@
diff -Nurd glibc-2.3.6.orig/linuxthreads/sysdeps/unix/sysv/linux/smp.h glibc-2.3.6/linuxthreads/sysdeps/unix/sysv/linux/smp.h
--- glibc-2.3.6.orig/linuxthreads/sysdeps/unix/sysv/linux/smp.h 2002-09-08 22:37:11.000000000 +0200
+++ glibc-2.3.6/linuxthreads/sysdeps/unix/sysv/linux/smp.h 2006-08-14 21:59:40.527190466 +0200
-@@ -25,24 +25,17 @@
+@@ -25,24 +25,6 @@
static inline int
is_smp_system (void)
{
- static const int sysctl_args[] = { CTL_KERN, KERN_VERSION };
- char buf[512];
- size_t reslen = sizeof (buf);
-
+- char buf[512];
+- size_t reslen = sizeof (buf);
+-
- /* Try reading the number using `sysctl' first. */
- if (__sysctl ((int *) sysctl_args,
- sizeof (sysctl_args) / sizeof (sysctl_args[0]),
@@ -20,54 +20,14 @@
- || (reslen = __read (fd, buf, sizeof (buf))) <= 0)
- /* This also didn't work. We give up and say it's a UP machine. */
- buf[0] = '\0';
-+ /* Try reading the /proc filesystem first. */
-+ int fd = __open ("/proc/sys/kernel/version", O_RDONLY);
-+ if (__builtin_expect (fd, 0) == -1
-+ || (reslen = __read (fd, buf, sizeof (buf))) <= 0)
-+ /* This didn't work. We give up and say it's a UP machine. */
-+ buf[0] = '\0';
-
+-
- __close (fd);
- }
-+ __close (fd);
-
- return strstr (buf, "SMP") != NULL;
+-
+- return strstr (buf, "SMP") != NULL;
++ /* Assume all machines are SMP and/or CMT and/or SMT. */
++ return 1;
}
-diff -Nurd glibc-2.3.6.orig/nptl/sysdeps/unix/sysv/linux/smp.h glibc-2.3.6/nptl/sysdeps/unix/sysv/linux/smp.h
---- glibc-2.3.6.orig/nptl/sysdeps/unix/sysv/linux/smp.h 2004-11-03 21:31:12.000000000 +0100
-+++ glibc-2.3.6/nptl/sysdeps/unix/sysv/linux/smp.h 2006-08-14 21:57:52.353875675 +0200
-@@ -29,24 +29,17 @@
- static inline int
- is_smp_system (void)
- {
-- static const int sysctl_args[] = { CTL_KERN, KERN_VERSION };
- char buf[512];
- size_t reslen = sizeof (buf);
-
-- /* Try reading the number using `sysctl' first. */
-- if (__sysctl ((int *) sysctl_args,
-- sizeof (sysctl_args) / sizeof (sysctl_args[0]),
-- buf, &reslen, NULL, 0) < 0)
-- {
-- /* 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';
-+ /* Try reading the /proc filesystem first. */
-+ 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 didn't work. We give up and say it's a UP machine. */
-+ buf[0] = '\0';
-
-- close_not_cancel_no_status (fd);
-- }
-+ close_not_cancel_no_status (fd);
-
- return strstr (buf, "SMP") != NULL;
- }
diff -Nurd glibc-2.3.6.orig/sysdeps/unix/sysv/linux/sysctl.c glibc-2.3.6/sysdeps/unix/sysv/linux/sysctl.c
--- glibc-2.3.6.orig/sysdeps/unix/sysv/linux/sysctl.c 2005-07-18 05:37:20.000000000 +0200
+++ glibc-2.3.6/sysdeps/unix/sysv/linux/sysctl.c 2006-08-14 22:12:28.454345256 +0200
@@ -75,7 +35,7 @@
}
libc_hidden_def (__sysctl)
weak_alias (__sysctl, sysctl)
-+link_warning (__sysctl, "the `sysctl' syscall has been removed from 2.6.18+ kernels, direct access to `/proc/sys' should be used instead.")
++link_warning (sysctl, "the `sysctl' syscall has been removed from 2.6.18+ kernels, direct access to `/proc/sys' should be used instead.")
diff -Nurd glibc-2.3.6.orig/sysdeps/unix/sysv/linux/arm/ioperm.c glibc-2.3.6/sysdeps/unix/sysv/linux/arm/ioperm.c
--- glibc-2.3.6.orig/sysdeps/unix/sysv/linux/arm/ioperm.c.orig 2006-08-15 18:23:08.715868260 +0200
+++ glibc-2.3.6/sysdeps/unix/sysv/linux/arm/ioperm.c 2006-08-15 19:30:07.215439365 +0200
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2006-08-20 15:00:06 UTC (rev 1766)
+++ glibc-package/trunk/debian/patches/series 2006-08-22 20:18:44 UTC (rev 1767)
@@ -136,12 +136,14 @@
any/cvs-regcomp_c.diff -p1
any/cvs-siginfo_h.diff -p1
any/cvs-static-getpid.diff -p1
+any/cvs-sysctl.diff -p1
any/cvs-thread_signals.diff -p0
any/cvs-tls-crashfix.diff -p1
any/cvs-tst-setcontext_c.diff -p1
any/cvs-resource_h.diff -p1
any/local-asserth-decls.diff -p0
#any/local-base.diff -p0 # g: suspended
+any/local-bashisms.diff -p1
any/local-dash.diff -p0
any/local-dl-execstack.diff -p0
any/local-fhs-linux-paths.diff -p1
Reply to: