diff --git a/sys/amd64/include/proc.h b/sys/amd64/include/proc.h --- a/sys/amd64/include/proc.h +++ b/sys/amd64/include/proc.h @@ -91,13 +91,6 @@ #define KINFO_PROC_SIZE 1088 #define KINFO_PROC32_SIZE 768 -struct syscall_args { - u_int code; - u_int original_code; - struct sysent *callp; - register_t args[8]; -}; - #ifdef _KERNEL /* Get the current kernel thread stack usage. */ diff --git a/sys/arm/include/proc.h b/sys/arm/include/proc.h --- a/sys/arm/include/proc.h +++ b/sys/arm/include/proc.h @@ -56,22 +56,6 @@ #define KINFO_PROC_SIZE 816 -#define MAXARGS 8 -/* - * This holds the syscall state for a single system call. - * As some syscall arguments may be 64-bit aligned we need to ensure the - * args value is 64-bit aligned. The ABI will then ensure any 64-bit - * arguments are already correctly aligned, even if they were passed in - * via registers, we just need to make sure we copy them to an aligned - * buffer. - */ -struct syscall_args { - u_int code; - u_int original_code; - struct sysent *callp; - register_t args[MAXARGS]; -} __aligned(8); - #ifdef _KERNEL #include diff --git a/sys/arm64/include/proc.h b/sys/arm64/include/proc.h --- a/sys/arm64/include/proc.h +++ b/sys/arm64/include/proc.h @@ -47,14 +47,6 @@ #define KINFO_PROC_SIZE 1088 #define KINFO_PROC32_SIZE 816 -#define MAXARGS 8 -struct syscall_args { - u_int code; - u_int original_code; - struct sysent *callp; - register_t args[MAXARGS]; -}; - #ifdef _KERNEL #include diff --git a/sys/i386/include/proc.h b/sys/i386/include/proc.h --- a/sys/i386/include/proc.h +++ b/sys/i386/include/proc.h @@ -62,13 +62,6 @@ #define KINFO_PROC_SIZE 768 -struct syscall_args { - u_int code; - u_int original_code; - struct sysent *callp; - register_t args[8]; -}; - #ifdef _KERNEL #include diff --git a/sys/mips/include/proc.h b/sys/mips/include/proc.h --- a/sys/mips/include/proc.h +++ b/sys/mips/include/proc.h @@ -81,14 +81,6 @@ size_t md_tls_tcb_offset; /* TCB offset */ }; -#define MAXARGS 8 -struct syscall_args { - u_int code; - u_int original_code; - struct sysent *callp; - register_t args[MAXARGS]; -}; - #ifdef __mips_n64 #define KINFO_PROC_SIZE 1088 #define KINFO_PROC32_SIZE 816 diff --git a/sys/powerpc/include/proc.h b/sys/powerpc/include/proc.h --- a/sys/powerpc/include/proc.h +++ b/sys/powerpc/include/proc.h @@ -59,14 +59,6 @@ #define KINFO_PROC_SIZE 816 #endif -#define MAXARGS 8 -struct syscall_args { - u_int code; - u_int original_code; - struct sysent *callp; - register_t args[MAXARGS]; -}; - #ifdef _KERNEL #include diff --git a/sys/riscv/include/proc.h b/sys/riscv/include/proc.h --- a/sys/riscv/include/proc.h +++ b/sys/riscv/include/proc.h @@ -45,14 +45,6 @@ #define KINFO_PROC_SIZE 1088 -#define MAXARGS 8 -struct syscall_args { - u_int code; - u_int original_code; - struct sysent *callp; - register_t args[MAXARGS]; -}; - #ifdef _KERNEL #include diff --git a/sys/sys/proc.h b/sys/sys/proc.h --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -193,7 +193,6 @@ struct sbuf; struct sleepqueue; struct socket; -struct syscall_args; struct td_sched; struct thread; struct trapframe; @@ -202,6 +201,14 @@ struct vm_map_entry; struct epoch_tracker; +#define MAXARGS 8 +struct syscall_args { + u_int code; + u_int original_code; + struct sysent *callp; + register_t args[MAXARGS]; +}; + /* * XXX: Does this belong in resource.h or resourcevar.h instead? * Resource usage extension. The times in rusage structs in the kernel are