missing_syscall: drop more defs below our kernel baseline

diff --git a/meson.build b/meson.build
index f96fed594d813b03cc495920046a20908a2a8e5f..6d86b057ef7e2292a1e01f42feabee71099daafd 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -770,7 +770,6 @@ if not cc.has_header('sys/capability.h')
 endif
 foreach header : ['crypt.h',
                   'linux/ioprio.h',
-                  'linux/time_types.h',
                   'sys/sdt.h',
                   'threads.h',
                   'valgrind/memcheck.h',

diff --git a/src/basic/fd-util.c b/src/basic/fd-util.c
index be22d6a04f297176762f73c63cea5fb62bfff45a..539e8ca925093df95a46b5eb5245bfda64f0cfa0 100644 (file)
--- a/src/basic/fd-util.c
+++ b/src/basic/fd-util.c
@@ -5,6 +5,7 @@
 #if WANT_LINUX_FS_H
 #include <linux/fs.h>
 #endif
+#include <linux/kcmp.h>
 #include <linux/magic.h>
 #include <sys/ioctl.h>
 #include <sys/resource.h>

diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h
index 37048e1bc081f82c21654bccceeff1b4ba5d17d5..47ff5a11aac6191961ee5d786aa21ad2ac30c7c8 100644 (file)
--- a/src/basic/missing_syscall.h
+++ b/src/basic/missing_syscall.h
@@ -5,11 +5,7 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#if HAVE_LINUX_TIME_TYPES_H
-/* This header defines __kernel_timespec for us, but is only available since Linux 5.1, hence conditionally
- * include this. */
 #include <linux/time_types.h>
-#endif
 #include <signal.h>
 #include <sys/syscall.h>
 #include <sys/types.h>
@@ -26,11 +22,6 @@
 #include "missing_stat.h"
 #include "missing_syscall_def.h"
 
-/* linux/kcmp.h */
-#ifndef KCMP_FILE /* 3f4994cfc15f38a3159c6e3a4b3ab2e1481a6b02 (3.19) */
-#define KCMP_FILE 0
-#endif
-
 /* ======================================================================= */
 
 #if !HAVE_FCHMODAT2