2009-09-24  Aurelien Jarno  <aurelien@aurel32.net>

	* sysdeps/unix/sysv/linux/kernel-features.h
	(__LINUX_KERNEL_VERSION): Update per-arch conditions when each
	feature was introduced.

diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h
index 29afe27..f16298b 100644
--- a/sysdeps/unix/sysv/linux/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/kernel-features.h
@@ -462,8 +462,15 @@
 # define __ASSUME_SET_ROBUST_LIST	1
 #endif
 
-/* Support for PI futexes was added in 2.6.18.  */
-#if __LINUX_KERNEL_VERSION >= 0x020612
+/* Support for PI futexes was added in 2.6.18 on i386, powerpc, s390, sparc64
+   x86_64. It was added in 2.6.19 on ia64 and in 2.6.23 on sh. */
+#if (__LINUX_KERNEL_VERSION >= 0x020612 && defined __i386__) \
+     || (__LINUX_KERNEL_VERSION >= 0x020612 && defined __powerpc__) \
+     || (__LINUX_KERNEL_VERSION >= 0x020612 && defined __s390__) \
+     || (__LINUX_KERNEL_VERSION >= 0x020612 && defined __sparc__ && __arch64__) \
+     || (__LINUX_KERNEL_VERSION >= 0x020612 && defined __x86_64__) \
+     || (__LINUX_KERNEL_VERSION >= 0x020613 && defined __ia64__) \
+     || (__LINUX_KERNEL_VERSION >= 0x020617 && defined __sh__)
 # define __ASSUME_FUTEX_LOCK_PI	1
 #endif