From b06e7e9a3b2adfbce2f18dfd32df6fd12d1e30c4 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Tue, 1 Aug 2006 06:55:58 +0000
Subject: [PATCH] * sysdeps/unix/sysv/linux/dl-osinfo.h: Remove unnecessary
 include.

	that the directory is empty even on non-POSIX filesystems.
---
 ChangeLog                           | 6 +++++-
 nptl/ChangeLog                      | 6 ++++++
 sysdeps/unix/sysv/linux/dl-osinfo.h | 1 -
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fbc8f11..52613d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-07-31  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/unix/sysv/linux/dl-osinfo.h: Remove unnecessary include.
+
 2006-07-16  Jeff Bailey  <jbailey@ubuntu.com>
 
 	* elf/tst-auditmod1.c: Fix typo in #error.
@@ -11,7 +15,7 @@
 2006-07-20  Adam Nemet  <anemet@caviumnetworks.com>
 
 	* stdlib/test-canon.c (do_test): Close fd before unlinking file so
-	that directory is empty even on non-POSIX filesystems.
+	that the directory is empty even on non-POSIX filesystems.
 
 2006-07-31  Ulrich Drepper  <drepper@redhat.com>
 
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 0ee39ed..070bf0d 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-31  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* allocatestack.c (__reclaim_stacks): Reset the PID on cached stacks.
+	* Makefile (tests): Add tst-getpid3.
+	* tst-getpid3.c: New file.
+
 2006-07-30  Roland McGrath  <roland@redhat.com>
 
 	* Makefile (libpthread-routines): Add ptw-sigsuspend.
diff --git a/sysdeps/unix/sysv/linux/dl-osinfo.h b/sysdeps/unix/sysv/linux/dl-osinfo.h
index f199d42..0738501 100644
--- a/sysdeps/unix/sysv/linux/dl-osinfo.h
+++ b/sysdeps/unix/sysv/linux/dl-osinfo.h
@@ -19,7 +19,6 @@
 
 #include <string.h>
 #include <fcntl.h>
-#include <sys/sysctl.h>
 #include <sys/utsname.h>
 #include <kernel-features.h>
 #include <dl-sysdep.h>
-- 
2.7.4