summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2018-07-24 21:03:04 +0200
committerFlorian Weimer <fweimer@redhat.com>2018-07-24 22:38:39 +0200
commite0f9c462d863d006424097879e30443f09771549 (patch)
tree8d98bd9dbffb9d00fbd60d94b20fc1a69e91c0f0
parent394df3815e8ceec750fd06583eee4896174ce808 (diff)
alpha: mlock2, copy_file_range syscalls were introduced in kernel 4.13
-rw-r--r--ChangeLog7
-rw-r--r--sysdeps/unix/sysv/linux/alpha/kernel-features.h4
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 28d21257d7..1545e05fb8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2018-07-24 Florian Weimer <fweimer@redhat.com>
+
+ * sysdeps/unix/sysv/linux/alpha/kernel-features.h
+ [__LINUX_KERNEL_VERSION < 0x040D00] (__ASSUME_MLOCK2)
+ (__ASSUME_COPY_FILE_RANGE): Undefine. Kernel support was added in
+ 4.13.
+
2018-07-24 H.J. Lu <hongjiu.lu@intel.com>
* sysdeps/unix/sysv/linux/x86/include/asm/prctl.h: New file.
diff --git a/sysdeps/unix/sysv/linux/alpha/kernel-features.h b/sysdeps/unix/sysv/linux/alpha/kernel-features.h
index f63be39d1b..402d2573d7 100644
--- a/sysdeps/unix/sysv/linux/alpha/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/alpha/kernel-features.h
@@ -45,8 +45,10 @@
# undef __ASSUME_EXECVEAT
#endif
-/* Support for statx was added in kernel 4.13. */
+/* Support for copy_file_range, statx was added in kernel 4.13. */
#if __LINUX_KERNEL_VERSION < 0x040D00
+# undef __ASSUME_MLOCK2
+# undef __ASSUME_COPY_FILE_RANGE
# undef __ASSUME_STATX
#endif