From 43f41dd393300522f3de526e48eba4321991055f Mon Sep 17 00:00:00 2001 From: Konstantin Belousov Date: Mon, 12 Jun 2017 20:53:44 +0000 Subject: [PATCH] Make struct syscall_args visible to userspace compilation environment from machine/proc.h, consistently on all architectures. Reviewed by: jhb Sponsored by: The FreeBSD Foundation MFC after: 3 weeks X-Differential revision: https://reviews.freebsd.org/D11080 --- sys/amd64/include/proc.h | 14 +++++++------- sys/arm64/include/proc.h | 4 ---- sys/i386/include/proc.h | 14 +++++++------- sys/mips/include/proc.h | 2 -- sys/powerpc/include/proc.h | 14 +++++++------- sys/riscv/include/proc.h | 4 ---- sys/sparc64/include/proc.h | 14 +++++++------- 7 files changed, 28 insertions(+), 38 deletions(-) diff --git a/sys/amd64/include/proc.h b/sys/amd64/include/proc.h index 8cd31ee86473..52e24460c5e2 100644 --- a/sys/amd64/include/proc.h +++ b/sys/amd64/include/proc.h @@ -70,6 +70,13 @@ struct mdproc { #define KINFO_PROC_SIZE 1088 #define KINFO_PROC32_SIZE 768 +struct syscall_args { + u_int code; + struct sysent *callp; + register_t args[8]; + int narg; +}; + #ifdef _KERNEL /* Get the current kernel thread stack usage. */ @@ -92,13 +99,6 @@ int amd64_set_ldt_data(struct thread *td, int start, int num, extern struct mtx dt_lock; extern int max_ldt_segment; - -struct syscall_args { - u_int code; - struct sysent *callp; - register_t args[8]; - int narg; -}; #endif /* _KERNEL */ #endif /* !_MACHINE_PROC_H_ */ diff --git a/sys/arm64/include/proc.h b/sys/arm64/include/proc.h index 94260f78d123..86dedbff0579 100644 --- a/sys/arm64/include/proc.h +++ b/sys/arm64/include/proc.h @@ -45,8 +45,6 @@ struct mdproc { #define KINFO_PROC_SIZE 1088 -#ifdef _KERNEL - #define MAXARGS 8 struct syscall_args { u_int code; @@ -55,6 +53,4 @@ struct syscall_args { int narg; }; -#endif - #endif /* !_MACHINE_PROC_H_ */ diff --git a/sys/i386/include/proc.h b/sys/i386/include/proc.h index 80a1306a8204..2a515f803c84 100644 --- a/sys/i386/include/proc.h +++ b/sys/i386/include/proc.h @@ -60,6 +60,13 @@ struct mdproc { #define KINFO_PROC_SIZE 768 +struct syscall_args { + u_int code; + struct sysent *callp; + register_t args[8]; + int narg; +}; + #ifdef _KERNEL /* Get the current kernel thread stack usage. */ @@ -77,13 +84,6 @@ void user_ldt_free(struct thread *); void user_ldt_deref(struct proc_ldt *pldt); extern struct mtx dt_lock; - -struct syscall_args { - u_int code; - struct sysent *callp; - register_t args[8]; - int narg; -}; #endif /* _KERNEL */ #endif /* !_MACHINE_PROC_H_ */ diff --git a/sys/mips/include/proc.h b/sys/mips/include/proc.h index 35d21699bbfe..46a81802ac49 100644 --- a/sys/mips/include/proc.h +++ b/sys/mips/include/proc.h @@ -80,7 +80,6 @@ struct mdproc { /* empty */ }; -#ifdef _KERNEL struct syscall_args { u_int code; struct sysent *callp; @@ -88,7 +87,6 @@ struct syscall_args { int narg; struct trapframe *trapframe; }; -#endif #ifdef __mips_n64 #define KINFO_PROC_SIZE 1088 diff --git a/sys/powerpc/include/proc.h b/sys/powerpc/include/proc.h index 4981581d97b9..d11cf8812952 100644 --- a/sys/powerpc/include/proc.h +++ b/sys/powerpc/include/proc.h @@ -53,6 +53,13 @@ struct mdproc { #define KINFO_PROC_SIZE 768 #endif +struct syscall_args { + u_int code; + struct sysent *callp; + register_t args[10]; + int narg; +}; + #ifdef _KERNEL #include @@ -65,13 +72,6 @@ struct mdproc { td->td_kstack_pages * PAGE_SIZE - \ (char *)&td; \ } while (0) - -struct syscall_args { - u_int code; - struct sysent *callp; - register_t args[10]; - int narg; -}; #endif #endif /* !_MACHINE_PROC_H_ */ diff --git a/sys/riscv/include/proc.h b/sys/riscv/include/proc.h index 673268130688..644bb91c4ad6 100644 --- a/sys/riscv/include/proc.h +++ b/sys/riscv/include/proc.h @@ -45,8 +45,6 @@ struct mdproc { #define KINFO_PROC_SIZE 1088 -#ifdef _KERNEL - #define MAXARGS 8 struct syscall_args { u_int code; @@ -55,6 +53,4 @@ struct syscall_args { int narg; }; -#endif - #endif /* !_MACHINE_PROC_H_ */ diff --git a/sys/sparc64/include/proc.h b/sys/sparc64/include/proc.h index 7fc081905d02..53ac6ac6fd48 100644 --- a/sys/sparc64/include/proc.h +++ b/sys/sparc64/include/proc.h @@ -53,6 +53,13 @@ struct mdproc { #define KINFO_PROC_SIZE 1088 +struct syscall_args { + u_int code; + struct sysent *callp; + register_t args[8]; + int narg; +}; + #ifdef _KERNEL #include @@ -66,13 +73,6 @@ struct mdproc { (char *)&td; \ } while (0) -struct syscall_args { - u_int code; - struct sysent *callp; - register_t args[8]; - int narg; -}; - #endif #endif /* !_MACHINE_PROC_H_ */