Include <kernel-features.h> explicitly where required.

This patch makes files using __ASSUME_* macros include
<kernel-features.h> explicitly, rather than relying on some other
header (such as tls.h, lowlevellock.h or pthreadP.h) to include it
implicitly.  (I omitted cases where I've already posted or am testing
the patch that stops the file from needing __ASSUME_* at all.)  This
accords with the general principle of making source files include the
headers for anything they use, and also helps make it safe to remove
<kernel-features.h> includes from any file that doesn't use
__ASSUME_* (some of those may be stray includes left behind after
increasing the minimum kernel version, others may never have been
needed or may have become obsolete after some other change).

Tested x86_64 that the disassembly of installed shared libraries is
unchanged by this patch.

	* nptl/pthread_cond_wait.c: Include <kernel-features.h>.
	* nptl/pthread_rwlock_timedrdlock.c: Likewise.
	* nptl/pthread_rwlock_timedwrlock.c: Likewise.
	* nptl/sysdeps/unix/sysv/linux/lowlevelrobustlock.c: Likewise.
	* nscd/nscd.c: Likewise.
	* sysdeps/i386/nptl/tcb-offsets.sym: Likewise.
	* sysdeps/powerpc/nptl/tcb-offsets.sym: Likewise.
	* sysdeps/sh/nptl/tcb-offsets.sym: Likewise.
	* sysdeps/x86_64/nptl/tcb-offsets.sym: Likewise.

10 files changed, 19 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 0e7c7e9b60..8cbe2ffa16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2014-06-20  Joseph Myers  <joseph@codesourcery.com>
 
+	* nptl/pthread_cond_wait.c: Include <kernel-features.h>.
+	* nptl/pthread_rwlock_timedrdlock.c: Likewise.
+	* nptl/pthread_rwlock_timedwrlock.c: Likewise.
+	* nptl/sysdeps/unix/sysv/linux/lowlevelrobustlock.c: Likewise.
+	* nscd/nscd.c: Likewise.
+	* sysdeps/i386/nptl/tcb-offsets.sym: Likewise.
+	* sysdeps/powerpc/nptl/tcb-offsets.sym: Likewise.
+	* sysdeps/sh/nptl/tcb-offsets.sym: Likewise.
+	* sysdeps/x86_64/nptl/tcb-offsets.sym: Likewise.
+
 	* nptl/sysdeps/unix/sysv/linux/mq_notify.c: Do not include
 	<kernel-features.h>.
 	(init_mq_netlink): Remove conditional have_sock_cloexec
diff --git a/nptl/pthread_cond_wait.c b/nptl/pthread_cond_wait.c
index 9d2dfceec5..fc5eac4386 100644
--- a/nptl/pthread_cond_wait.c
+++ b/nptl/pthread_cond_wait.c
@@ -22,6 +22,7 @@
 #include <lowlevellock.h>
 #include <pthread.h>
 #include <pthreadP.h>
+#include <kernel-features.h>
 
 #include <shlib-compat.h>
 #include <stap-probe.h>
diff --git a/nptl/pthread_rwlock_timedrdlock.c b/nptl/pthread_rwlock_timedrdlock.c
index 81b2ee4096..340ae3d394 100644
--- a/nptl/pthread_rwlock_timedrdlock.c
+++ b/nptl/pthread_rwlock_timedrdlock.c
@@ -21,6 +21,7 @@
 #include <lowlevellock.h>
 #include <pthread.h>
 #include <pthreadP.h>
+#include <kernel-features.h>
 
 
 /* Try to acquire read lock for RWLOCK or return after specfied time.  */
diff --git a/nptl/pthread_rwlock_timedwrlock.c b/nptl/pthread_rwlock_timedwrlock.c
index 26f2139c9f..be94a207f6 100644
--- a/nptl/pthread_rwlock_timedwrlock.c
+++ b/nptl/pthread_rwlock_timedwrlock.c
@@ -21,6 +21,7 @@
 #include <lowlevellock.h>
 #include <pthread.h>
 #include <pthreadP.h>
+#include <kernel-features.h>
 
 
 /* Try to acquire write lock for RWLOCK or return after specfied time.	*/
diff --git a/nptl/sysdeps/unix/sysv/linux/lowlevelrobustlock.c b/nptl/sysdeps/unix/sysv/linux/lowlevelrobustlock.c
index c894b1ecda..35258071cf 100644
--- a/nptl/sysdeps/unix/sysv/linux/lowlevelrobustlock.c
+++ b/nptl/sysdeps/unix/sysv/linux/lowlevelrobustlock.c
@@ -21,6 +21,7 @@
 #include <lowlevellock.h>
 #include <sys/time.h>
 #include <pthreadP.h>
+#include <kernel-features.h>
 
 
 int
diff --git a/nscd/nscd.c b/nscd/nscd.c
index 56803785e1..a4c71e90e2 100644
--- a/nscd/nscd.c
+++ b/nscd/nscd.c
@@ -50,6 +50,7 @@
 #ifdef HAVE_INOTIFY
 # include <sys/inotify.h>
 #endif
+#include <kernel-features.h>
 
 /* Get libc version number.  */
 #include <version.h>
diff --git a/sysdeps/i386/nptl/tcb-offsets.sym b/sysdeps/i386/nptl/tcb-offsets.sym
index 69f9deb368..7bdf161b29 100644
--- a/sysdeps/i386/nptl/tcb-offsets.sym
+++ b/sysdeps/i386/nptl/tcb-offsets.sym
@@ -1,5 +1,6 @@
 #include <sysdep.h>
 #include <tls.h>
+#include <kernel-features.h>
 
 RESULT			offsetof (struct pthread, result)
 TID			offsetof (struct pthread, tid)
diff --git a/sysdeps/powerpc/nptl/tcb-offsets.sym b/sysdeps/powerpc/nptl/tcb-offsets.sym
index eac5b5c732..f996759027 100644
--- a/sysdeps/powerpc/nptl/tcb-offsets.sym
+++ b/sysdeps/powerpc/nptl/tcb-offsets.sym
@@ -1,5 +1,6 @@
 #include <sysdep.h>
 #include <tls.h>
+#include <kernel-features.h>
 
 --
 
diff --git a/sysdeps/sh/nptl/tcb-offsets.sym b/sysdeps/sh/nptl/tcb-offsets.sym
index 753b72b2dd..ac63b5b93b 100644
--- a/sysdeps/sh/nptl/tcb-offsets.sym
+++ b/sysdeps/sh/nptl/tcb-offsets.sym
@@ -1,5 +1,6 @@
 #include <sysdep.h>
 #include <tls.h>
+#include <kernel-features.h>
 
 RESULT			offsetof (struct pthread, result)
 TID			offsetof (struct pthread, tid)
diff --git a/sysdeps/x86_64/nptl/tcb-offsets.sym b/sysdeps/x86_64/nptl/tcb-offsets.sym
index cf863752ee..729d1da38f 100644
--- a/sysdeps/x86_64/nptl/tcb-offsets.sym
+++ b/sysdeps/x86_64/nptl/tcb-offsets.sym
@@ -1,5 +1,6 @@
 #include <sysdep.h>
 #include <tls.h>
+#include <kernel-features.h>
 
 RESULT			offsetof (struct pthread, result)
 TID			offsetof (struct pthread, tid)