about summary refs log tree commit diff
path: root/sysdeps/unix/sysv/linux
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2006-01-06 07:30:36 +0000
committerUlrich Drepper <drepper@redhat.com>2006-01-06 07:30:36 +0000
commite7ebabedca9a495ac68a6fe59c81c05404ccc725 (patch)
tree43bc38927812038e8529d15cb9f68103f71ee845 /sysdeps/unix/sysv/linux
parentb957e864209026ab126d1eebedc0a2f0beaf853a (diff)
downloadglibc-e7ebabedca9a495ac68a6fe59c81c05404ccc725.tar.gz
glibc-e7ebabedca9a495ac68a6fe59c81c05404ccc725.tar.xz
glibc-e7ebabedca9a495ac68a6fe59c81c05404ccc725.zip
* sysdeps/unix/sysv/linux/kernel-features.h (__ASSUME_WAITID_SYSCALL): cvs/fedora-glibc-20060106T0916
	Only define for 2.6.12+ on s390{,x}.
	(__ASSUME_GETDENTS32_D_TYPE): Only define for 2.6.8+ on most arches
	and only for 2.6.11+ on s390{,x}.
Diffstat (limited to 'sysdeps/unix/sysv/linux')
-rw-r--r--sysdeps/unix/sysv/linux/kernel-features.h16
1 files changed, 10 insertions, 6 deletions
diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h
index 9bbd97e6d2..3bc5dc03c2 100644
--- a/sysdeps/unix/sysv/linux/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/kernel-features.h
@@ -1,6 +1,6 @@
 /* Set flags signalling availability of kernel features based on given
    kernel version number.
-   Copyright (C) 1999-2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1999-2003, 2004, 2005, 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
@@ -423,8 +423,10 @@
 #endif
 
 /* Starting with version 2.6.4-rc1 the getdents syscall returns d_type
-   information as well.  */
-#if __LINUX_KERNEL_VERSION >= 132612
+   information as well and in between 2.6.5 and 2.6.8 most compat wrappers
+   were fixed too.  Except s390{,x} which was fixed in 2.6.11.  */
+#if (__LINUX_KERNEL_VERSION >= 0x020608 && !defined __s390__) \
+    || (__LINUX_KERNEL_VERSION >= 0x02060b && defined __s390__)
 # define __ASSUME_GETDENTS32_D_TYPE	1
 #endif
 
@@ -435,9 +437,11 @@
 #endif
 
 /* Starting with version 2.6.9, the waitid system call is available.
-   Except for powerpc and powerpc64, where it is available in 2.6.12.  */
-#if (__LINUX_KERNEL_VERSION >= 0x020609 && !defined __powerpc__) \
-    || (__LINUX_KERNEL_VERSION >= 0x02060c && defined __powerpc__)
+   Except for powerpc{,64} and s390{,x}, where it is available in 2.6.12.  */
+#if (__LINUX_KERNEL_VERSION >= 0x020609 \
+     && !defined __powerpc__ && !defined __s390__) \
+    || (__LINUX_KERNEL_VERSION >= 0x02060c \
+	&& (defined __powerpc__ || defined __s390__))
 # define __ASSUME_WAITID_SYSCALL	1
 #endif