Include "kernel_types.h" in defs.h and tests/tests.h

As kernel_ulong_t type is going to be used in the definition
of struct tcb and in many function prototypes, make it readily
available for every source file by including "kernel_types.h"
in defs.h and tests/tests.h files.

* defs.h: Include "kernel_types.h".
* tests/tests.h: Likewise.
* desc.c: Do not include "kernel_types.h".
* dirent.c: Likewise.
* keyctl.c: Likewise.
* syscall.c: Likewise.
* linux/asm_stat.h: Likewise.
* tests/answer.c: Likewise.
* tests/epoll_pwait.c: Likewise.
* tests/fanotify_init.c: Likewise.
* tests/fanotify_mark.c: Likewise.
* tests/file_handle.c: Likewise.
* tests/ftruncate.c: Likewise.
* tests/getdents.c: Likewise.
* tests/init_delete_module.h: Likewise.
* tests/inotify.c: Likewise.
* tests/inotify_init1.c: Likewise.
* tests/ioprio.c: Likewise.
* tests/ipc_msgbuf.c: Likewise.
* tests/kcmp.c: Likewise.
* tests/kexec_file_load.c: Likewise.
* tests/kexec_load.c: Likewise.
* tests/keyctl.c: Likewise.
* tests/lookup_dcookie.c: Likewise.
* tests/lseek.c: Likewise.
* tests/mq_sendrecv.c: Likewise.
* tests/nsyscalls.c: Likewise.
* tests/pkey_alloc.c: Likewise.
* tests/pkey_free.c: Likewise.
* tests/pkey_mprotect.c: Likewise.
* tests/prctl-pdeathsig.c: Likewise.
* tests/prctl-tsc.c: Likewise.
* tests/preadv2-pwritev2.c: Likewise.
* tests/process_vm_readv_writev.c: Likewise.
* tests/read-write.c: Likewise.
* tests/setfsugid.c: Likewise.
* tests/setns.c: Likewise.
* tests/truncate.c: Likewise.
* tests/unshare.c: Likewise.
* tests/xgetrlimit.c: Likewise.

diff --git a/defs.h b/defs.h
index cdeb22fd333867b383c7a1dccc87b09a2f946199..0af7c888b2862ecde1b2ee5f7540c1376096fb67 100644 (file)
--- a/defs.h
+++ b/defs.h
@@ -53,6 +53,7 @@
 #include <sys/time.h>
 #include <asm/unistd.h>
 
+#include "kernel_types.h"
 #include "mpers_type.h"
 #include "gcc_compat.h"
 

diff --git a/desc.c b/desc.c
index 4695db5830d7dee5fd4a984da8f940f6e23b4024..5badb144fe50fb2797f48d69e6bd8c5241a2917f 100644 (file)
--- a/desc.c
+++ b/desc.c
@@ -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)

diff --git a/dirent.c b/dirent.c
index c27767526b98dfe14052bc48197bb96389f569e2..936453e07a243c7ce75989b89e63e1d93324a452 100644 (file)
--- a/dirent.c
+++ b/dirent.c
@@ -33,8 +33,6 @@
 
 #include DEF_MPERS_TYPE(kernel_dirent)
 
-#include "kernel_types.h"
-
 #include MPERS_DEFS
 
 #define D_NAME_LEN_MAX 256

diff --git a/keyctl.c b/keyctl.c
index 7f047c6bfe2304f91d07ff8d79dc463339a64de2..94c297655974ab325dda44a5096ebc30ec0ee8e9 100644 (file)
--- a/keyctl.c
+++ b/keyctl.c
@@ -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 72a67e1d5e433f11aa4916c1d59456a5f339746e..a926602024068dbbe9a36976f37949fb6d289e8b 100644 (file)
--- 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

diff --git a/syscall.c b/syscall.c
index 685ea9297e7c99ff17dc8faa3d782d0e0c5dac64..03dc350ab0df9340202c1777f4a7d9855edc59d9 100644 (file)
--- a/syscall.c
+++ b/syscall.c
@@ -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 8d5387e833657853c60b7e0dc8a1096e26cb8f38..ae3059a4880dd6c6c3c7313d1c33eb88d93e391d 100644 (file)
--- 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 27337ecebcf53cac5be0ca11dd3da610601ccdda..eaaa34d6245fa2d7f4c79188d1baaa6de1c3e5b7 100644 (file)
--- 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 f784e1954915e4c26ab40920be233f0b964a78c7..c14b413186323d3c24bf17a5bc582d3061714a10 100644 (file)
--- 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 c475756e2aaf5f316f0f90fb321aed239636a526..43f285d33bc408724bbe94f66154235be18ff94c 100644 (file)
--- 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 227977514c438c87a90ec1569a8e983c23fe4427..a5ad6c73d74ae0130b1b52c44fc4fdfe1a44ec09 100644 (file)
--- 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 315f7bf12d8b11cdd78406c15303f542c5e7f2fb..ee17455f09eef84108925841796d6c4ce45dfd99 100644 (file)
--- 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 4c8455f89b1dd937d4185b5f841f7f8229ff245b..b787c837bc4faac619c641941174df40c6c9c9ad 100644 (file)
--- 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 f16994c7ff06d642e0dff8ddef4acaae50359998..db550c33ca70e099c62a5e19efb27dea786177d8 100644 (file)
--- 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 fb665526c4cf5276d8362979415807c38a7e2738..925d69ffee6e4339bf88281804d986c5a9e4967d 100644 (file)
--- 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 4c08259bbd0e379651d5c1c70380a768784f9c55..0325150d973e178f381a8854e00c2595fb31b3f6 100644 (file)
--- 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 6f360adb4113f7ce9c33920297a10c5122101b08..44ace6c3ec151659ffd6ae3b1e6495de1336e56e 100644 (file)
--- 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 2c90d2688a7f56c480ba06b52c6d00ecdb31209e..1c34494d83f8e777ae196b1a3524a9aaed5c7feb 100644 (file)
--- 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 2e2e5ff5ac533fbee5c014f5800b81abe58c01cc..0f43c634756fdd983d869071093093d46fb119ab 100644 (file)
--- 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 5846c6af1d48a919966621b5ddb2046da6dc7ae4..b44cbce226d98358caccbe44e2e7bcacaf425094 100644 (file)
--- 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 45834c9ae3319c22226f03451cad366560889a61..8eb0e2722b91b1c0483b143e6faf707eb47aec9f 100644 (file)
--- 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 f071e707c8d302ed234bfe8218c497af2696d2bc..2e26076b152ac3a5d1346d07428c46023db5e6ca 100644 (file)
--- 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 335efb236458cdc10c1cc69bb06c4578804da93f..986180ce3e6ac0ea84c9a1144da69c0e0848e057 100644 (file)
--- 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 84b27529ad61a1397fa0c183df2587d9a2e1cd6a..4428c4e91bc76a5b8579cce1a4e1ebabcc9d4e57 100644 (file)
--- 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 995bbb0d0cc52ce543a44e1791a987453131536b..a5bed01b8adb53a6b55eb60f8d95df348224a9e7 100644 (file)
--- 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 68cb1481abf22eef3d6c3d41c14b30e2eefdaef9..9c8b30a71f958fc804472a10425244b13423ed5c 100644 (file)
--- 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 906d67f8313b9ebb104397fc06e52f73ee11fda2..19840f24b30e537ace224b52535fcdba2ee7c21d 100644 (file)
--- 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 13f9e58ffb9758d268e40d1fe9fabbbc4704872f..1815ad9f4840b12810b2daba47894ae2720e6cab 100644 (file)
--- 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 e62ae795e2aa259686697e7112a92f6b755fe816..6ba7788497f01d5b7893a493ab446fc60f9f3eb7 100644 (file)
--- 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 a2143c2896e41a8a9c1abb96ed4de230c80ff8fd..c17603072a0ddd404aadde691b036eb6ba761b69 100644 (file)
--- 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 86668d95ebdd4c295a9504938d9617b741fe3c91..fd9362d76f8b862147aeee80821e376554319f2b 100644 (file)
--- 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 fb725071b35b1c3280b94263726a3624650f825e..9f1dd95df0da43ae8325ecda31c523ebd876fc6f 100644 (file)
--- 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 7e9b52a9786cf9f69f5d8e1d55b1062993b7cc0b..2a089395abcd25d75918957d2e096fd62568e293 100644 (file)
--- 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 0e3ff66afbb911ea898285bf3a981129cc6b7581..262e07b5be6b153fb0ef30a39e19bbef0e50e03c 100644 (file)
--- 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 a410c9d9e1958e6a904ea959ba050b3a8d8ab7f1..79ba34d893558464da384c61a9152bf85e54aba9 100644 (file)
--- 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 5c08802b8916bced993e8bbf90a03eed1cb1b5f7..54a15317e92704a3f9f93530f105363560cfbb23 100644 (file)
--- 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 f2e0a82b12fa7262f0db04be48d59b441e680bba..1724124b8879e61d33c38b4baebc49396e2f6651 100644 (file)
--- 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 3f16aefd1f17c49bc459c9b763cb02b4859d54e5..d9529334e08e2e433626df8d02fc7620432fa0e4 100644 (file)
--- 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 7b702dcb69e5b04496338a3f93879cb5044c5a4e..5aedde4761a0da5f2d177bac2af54f19e775b1eb 100644 (file)
--- 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 54ced9a7bca104c2de45f4647596545e1396c84f..78d9cb997849145407614362560237eeca30d832 100644 (file)
--- 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"