diff options
40 files changed, 2 insertions, 70 deletions
@@ -53,6 +53,7 @@ #include <sys/time.h> #include <asm/unistd.h> +#include "kernel_types.h" #include "mpers_type.h" #include "gcc_compat.h" @@ -226,8 +226,6 @@ SYS_FUNC(select) return decode_select(tcp, tcp->u_arg, print_timeval, sprint_timeval); } -#include "kernel_types.h" - static int umove_kulong_array_or_printaddr(struct tcb *tcp, const long addr, kernel_ulong_t *ptr, size_t n) @@ -33,8 +33,6 @@ #include DEF_MPERS_TYPE(kernel_dirent) -#include "kernel_types.h" - #include MPERS_DEFS #define D_NAME_LEN_MAX 256 @@ -26,7 +26,6 @@ */ #include "defs.h" -#include "kernel_types.h" typedef int32_t key_serial_t; diff --git a/linux/asm_stat.h b/linux/asm_stat.h index 72a67e1d5..a92660202 100644 --- a/linux/asm_stat.h +++ b/linux/asm_stat.h @@ -1,8 +1,6 @@ #ifndef STRACE_ASM_STAT_H #define STRACE_ASM_STAT_H -# include "kernel_types.h" - # undef dev_t # undef gid_t # undef ino_t @@ -1003,8 +1003,6 @@ restore_cleared_syserror(struct tcb *tcp) tcp->u_error = saved_u_error; } -#include "kernel_types.h" - /* * Check the syscall return value register value for whether it is * a negated errno code indicating an error, or a success return value. diff --git a/tests/answer.c b/tests/answer.c index 8d5387e83..ae3059a48 100644 --- a/tests/answer.c +++ b/tests/answer.c @@ -30,7 +30,6 @@ #include "tests.h" #include <unistd.h> #include <asm/unistd.h> -#include "kernel_types.h" int main(void) diff --git a/tests/epoll_pwait.c b/tests/epoll_pwait.c index 27337eceb..eaaa34d62 100644 --- a/tests/epoll_pwait.c +++ b/tests/epoll_pwait.c @@ -8,8 +8,6 @@ # include <sys/epoll.h> # include <unistd.h> -# include "kernel_types.h" - int main(void) { diff --git a/tests/fanotify_init.c b/tests/fanotify_init.c index f784e1954..c14b41318 100644 --- a/tests/fanotify_init.c +++ b/tests/fanotify_init.c @@ -37,8 +37,6 @@ # include <stdio.h> # include <unistd.h> -# include "kernel_types.h" - /* Performs fanotify_init call via the syscall interface. */ static void do_call(kernel_ulong_t flags, const char *flags_str, diff --git a/tests/fanotify_mark.c b/tests/fanotify_mark.c index c475756e2..43f285d33 100644 --- a/tests/fanotify_mark.c +++ b/tests/fanotify_mark.c @@ -38,11 +38,8 @@ # include <limits.h> # include <stdio.h> # include <unistd.h> - # include <sys/fanotify.h> -# include "kernel_types.h" - /* Performs fanotify_mark call via the syscall interface. */ static void do_call(kernel_ulong_t fd, kernel_ulong_t flags, const char *flags_str, diff --git a/tests/file_handle.c b/tests/file_handle.c index 227977514..a5ad6c73d 100644 --- a/tests/file_handle.c +++ b/tests/file_handle.c @@ -41,8 +41,6 @@ # include <stdbool.h> # include <unistd.h> -# include "kernel_types.h" - enum assert_rc { ASSERT_NONE, ASSERT_SUCCESS, diff --git a/tests/ftruncate.c b/tests/ftruncate.c index 315f7bf12..ee17455f0 100644 --- a/tests/ftruncate.c +++ b/tests/ftruncate.c @@ -33,8 +33,6 @@ # include <stdio.h> # include <unistd.h> -# include "kernel_types.h" - int main(void) { diff --git a/tests/getdents.c b/tests/getdents.c index 4c8455f89..b787c837b 100644 --- a/tests/getdents.c +++ b/tests/getdents.c @@ -37,7 +37,6 @@ # include <stdio.h> # include <sys/stat.h> # include <unistd.h> -# include "kernel_types.h" static const char fname[] = "A\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\n" diff --git a/tests/init_delete_module.h b/tests/init_delete_module.h index f16994c7f..db550c33c 100644 --- a/tests/init_delete_module.h +++ b/tests/init_delete_module.h @@ -34,9 +34,6 @@ # include <stdbool.h> # include <stdio.h> -# include "kernel_types.h" - - enum { PARAM1_LEN = 33, PARAM2_LEN = 8, diff --git a/tests/inotify.c b/tests/inotify.c index fb665526c..925d69ffe 100644 --- a/tests/inotify.c +++ b/tests/inotify.c @@ -37,8 +37,6 @@ # include <string.h> # include <unistd.h> -# include "kernel_types.h" - int main(void) { diff --git a/tests/inotify_init1.c b/tests/inotify_init1.c index 4c08259bb..0325150d9 100644 --- a/tests/inotify_init1.c +++ b/tests/inotify_init1.c @@ -37,8 +37,6 @@ # include <stdio.h> # include <unistd.h> -# include "kernel_types.h" - # ifdef O_CLOEXEC # define cloexec_flag O_CLOEXEC # else diff --git a/tests/ioprio.c b/tests/ioprio.c index 6f360adb4..44ace6c3e 100644 --- a/tests/ioprio.c +++ b/tests/ioprio.c @@ -36,8 +36,6 @@ # include <stdio.h> # include <unistd.h> -# include "kernel_types.h" - enum { IOPRIO_CLASS_NONE, IOPRIO_CLASS_RT, diff --git a/tests/ipc_msgbuf.c b/tests/ipc_msgbuf.c index 2c90d2688..1c34494d8 100644 --- a/tests/ipc_msgbuf.c +++ b/tests/ipc_msgbuf.c @@ -31,7 +31,6 @@ #include <sys/ipc.h> #include <sys/msg.h> #include <sys/stat.h> -#include "kernel_types.h" #define text_string "STRACE_STRING" #define msgsz sizeof(text_string) diff --git a/tests/kcmp.c b/tests/kcmp.c index 2e2e5ff5a..0f43c6347 100644 --- a/tests/kcmp.c +++ b/tests/kcmp.c @@ -36,8 +36,6 @@ # include <stdio.h> # include <unistd.h> -# include "kernel_types.h" - # define KCMP_FILE 0 # define KCMP_SYSVSEM 6 diff --git a/tests/kexec_file_load.c b/tests/kexec_file_load.c index 5846c6af1..b44cbce22 100644 --- a/tests/kexec_file_load.c +++ b/tests/kexec_file_load.c @@ -37,8 +37,6 @@ # include <stdio.h> # include <unistd.h> -# include "kernel_types.h" - struct strval { kernel_ulong_t val; const char *str64; diff --git a/tests/kexec_load.c b/tests/kexec_load.c index 45834c9ae..8eb0e2722 100644 --- a/tests/kexec_load.c +++ b/tests/kexec_load.c @@ -36,8 +36,6 @@ # include <stdio.h> # include <unistd.h> -# include "kernel_types.h" - struct strval { kernel_ulong_t val; const char *str64; diff --git a/tests/keyctl.c b/tests/keyctl.c index f071e707c..2e26076b1 100644 --- a/tests/keyctl.c +++ b/tests/keyctl.c @@ -44,11 +44,8 @@ # include <stdlib.h> # include <string.h> # include <unistd.h> - # include <sys/uio.h> -# include "kernel_types.h" - /* This check should be before #include "xlat/keyctl_commands.h" */ # ifndef KEYCTL_DH_COMPUTE struct keyctl_dh_params { diff --git a/tests/lookup_dcookie.c b/tests/lookup_dcookie.c index 335efb236..986180ce3 100644 --- a/tests/lookup_dcookie.c +++ b/tests/lookup_dcookie.c @@ -38,9 +38,6 @@ # include <stdio.h> # include <unistd.h> -# include "kernel_types.h" - - static void do_lookup_cookie(uint64_t cookie, char *buf, kernel_ulong_t len) { diff --git a/tests/lseek.c b/tests/lseek.c index 84b27529a..4428c4e91 100644 --- a/tests/lseek.c +++ b/tests/lseek.c @@ -32,7 +32,6 @@ # include <stdio.h> # include <unistd.h> -# include "kernel_types.h" int main(void) diff --git a/tests/mq_sendrecv.c b/tests/mq_sendrecv.c index 995bbb0d0..a5bed01b8 100644 --- a/tests/mq_sendrecv.c +++ b/tests/mq_sendrecv.c @@ -47,7 +47,6 @@ # include <time.h> # include <unistd.h> -# include "kernel_types.h" # include "sigevent.h" # ifndef MQ_NAME diff --git a/tests/nsyscalls.c b/tests/nsyscalls.c index 68cb1481a..9c8b30a71 100644 --- a/tests/nsyscalls.c +++ b/tests/nsyscalls.c @@ -28,7 +28,6 @@ */ #include "defs.h" -#include "kernel_types.h" #include "syscall.h" #define TD 0 diff --git a/tests/pkey_alloc.c b/tests/pkey_alloc.c index 906d67f83..19840f24b 100644 --- a/tests/pkey_alloc.c +++ b/tests/pkey_alloc.c @@ -36,8 +36,6 @@ # include <stdio.h> # include <unistd.h> -# include "kernel_types.h" - int main(void) { diff --git a/tests/pkey_free.c b/tests/pkey_free.c index 13f9e58ff..1815ad9f4 100644 --- a/tests/pkey_free.c +++ b/tests/pkey_free.c @@ -36,8 +36,6 @@ # include <stdio.h> # include <unistd.h> -# include "kernel_types.h" - int main(void) { diff --git a/tests/pkey_mprotect.c b/tests/pkey_mprotect.c index e62ae795e..6ba778849 100644 --- a/tests/pkey_mprotect.c +++ b/tests/pkey_mprotect.c @@ -38,8 +38,6 @@ #include <sys/mman.h> -# include "kernel_types.h" - const char * sprintptr(kernel_ulong_t ptr) { diff --git a/tests/prctl-pdeathsig.c b/tests/prctl-pdeathsig.c index a2143c289..c17603072 100644 --- a/tests/prctl-pdeathsig.c +++ b/tests/prctl-pdeathsig.c @@ -38,8 +38,6 @@ # include <unistd.h> # include <sys/signal.h> -# include "kernel_types.h" - int main(void) { diff --git a/tests/prctl-tsc.c b/tests/prctl-tsc.c index 86668d95e..fd9362d76 100644 --- a/tests/prctl-tsc.c +++ b/tests/prctl-tsc.c @@ -37,8 +37,6 @@ # include <stdio.h> # include <unistd.h> -# include "kernel_types.h" - int main(void) { diff --git a/tests/preadv2-pwritev2.c b/tests/preadv2-pwritev2.c index fb725071b..9f1dd95df 100644 --- a/tests/preadv2-pwritev2.c +++ b/tests/preadv2-pwritev2.c @@ -37,7 +37,6 @@ # include <stdio.h> # include <sys/uio.h> # include <unistd.h> -# include "kernel_types.h" static int pr(const int fd, const struct iovec *const vec, diff --git a/tests/process_vm_readv_writev.c b/tests/process_vm_readv_writev.c index 7e9b52a97..2a089395a 100644 --- a/tests/process_vm_readv_writev.c +++ b/tests/process_vm_readv_writev.c @@ -30,11 +30,8 @@ #include <inttypes.h> #include <stdio.h> #include <unistd.h> - #include <sys/uio.h> -#include "kernel_types.h" - #if OP_WR # define in_iovec rmt_iovec # define out_iovec lcl_iovec diff --git a/tests/read-write.c b/tests/read-write.c index 0e3ff66af..262e07b5b 100644 --- a/tests/read-write.c +++ b/tests/read-write.c @@ -34,7 +34,6 @@ #include <stdlib.h> #include <unistd.h> #include <asm/unistd.h> -#include "kernel_types.h" static void dump_str(const char *str, const unsigned int len) diff --git a/tests/setfsugid.c b/tests/setfsugid.c index a410c9d9e..79ba34d89 100644 --- a/tests/setfsugid.c +++ b/tests/setfsugid.c @@ -30,8 +30,6 @@ #include <stdio.h> #include <unistd.h> -#include "kernel_types.h" - void printuid(unsigned UGID_TYPE id) { diff --git a/tests/setns.c b/tests/setns.c index 5c08802b8..54a15317e 100644 --- a/tests/setns.c +++ b/tests/setns.c @@ -36,8 +36,6 @@ # include <stdio.h> # include <unistd.h> -# include "kernel_types.h" - int main(void) { diff --git a/tests/tests.h b/tests/tests.h index f2e0a82b1..1724124b8 100644 --- a/tests/tests.h +++ b/tests/tests.h @@ -33,6 +33,7 @@ # endif # include <sys/types.h> +# include "kernel_types.h" # include "gcc_compat.h" /* Tests of "strace -v" are expected to define VERBOSE to 1. */ diff --git a/tests/truncate.c b/tests/truncate.c index 3f16aefd1..d9529334e 100644 --- a/tests/truncate.c +++ b/tests/truncate.c @@ -32,7 +32,6 @@ # include <stdio.h> # include <unistd.h> -# include "kernel_types.h" int main(void) diff --git a/tests/unshare.c b/tests/unshare.c index 7b702dcb6..5aedde476 100644 --- a/tests/unshare.c +++ b/tests/unshare.c @@ -36,8 +36,6 @@ # include <stdio.h> # include <unistd.h> -# include "kernel_types.h" - int main(void) { diff --git a/tests/xgetrlimit.c b/tests/xgetrlimit.c index 54ced9a7b..78d9cb997 100644 --- a/tests/xgetrlimit.c +++ b/tests/xgetrlimit.c @@ -33,7 +33,6 @@ #include <sys/resource.h> #include <unistd.h> -#include "kernel_types.h" #include "xlat.h" #include "xlat/resources.h" |