about summary refs log tree commit diff
path: root/sysdeps/unix
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2012-08-20 14:38:48 +0000
committerJoseph Myers <joseph@codesourcery.com>2012-08-20 14:38:48 +0000
commit445f7ecd666e29fed3fd429f8d808bc5e8277b0a (patch)
treefa3169f6aeeb897677d594c9d6bac5f525cdac51 /sysdeps/unix
parent348363b2c3ee93252a971ead851085739d8d04fb (diff)
downloadglibc-445f7ecd666e29fed3fd429f8d808bc5e8277b0a.tar.gz
glibc-445f7ecd666e29fed3fd429f8d808bc5e8277b0a.tar.xz
glibc-445f7ecd666e29fed3fd429f8d808bc5e8277b0a.zip
Define __ASSUME_UTIMES for s390.
Diffstat (limited to 'sysdeps/unix')
-rw-r--r--sysdeps/unix/sysv/linux/kernel-features.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h
index 06e15111aa..13adaad2c1 100644
--- 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