Define __ASSUME_UTIMES for s390.

diff --git a/ChangeLog b/ChangeLog
index ab7a87d..df7f090 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2012-08-20  Joseph Myers  <joseph@codesourcery.com>
 
+       * sysdeps/unix/sysv/linux/kernel-features.h [__s390__ &&
+       __LINUX_KERNEL_VERSION >= 0x020616] (__ASSUME_UTIMES): Define.
+
        * sysdeps/unix/sysv/linux/kernel-features.h
        (__ASSUME_MMAP2_SYSCALL): Remove all definitions.
        * sysdeps/unix/sysv/linux/mmap64.c [__NR_mmap2]: Make code

diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h
index 06e1511..13adaad 100644 (file)
--- a/sysdeps/unix/sysv/linux/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/kernel-features.h
@@ -87,12 +87,14 @@
 
 /* The utimes syscall has been available for some architectures
    forever.  For x86 it was introduced after 2.5.75, for x86-64,
-   ppc, and ppc64 it was introduced in 2.6.0-test3.  */
+   ppc, and ppc64 it was introduced in 2.6.0-test3, for s390 it was
+   introduced in 2.6.21-rc5.  */
 #if defined __sparc__ \
     || defined __i386__ \
     || defined __x86_64__ \
     || defined __powerpc__ \
-    || defined __sh__
+    || defined __sh__ \
+    || (defined __s390__ && __LINUX_KERNEL_VERSION >= 0x020616)
 # define __ASSUME_UTIMES       1
 #endif