Revert "Revert "MFC r319871:""

This reverts commit 63302e53ed4b3fe59711d939ba87433a9a12199d.

7 files changed, 28 insertions, 38 deletions

diff --git a/sys/amd64/include/proc.h b/sys/amd64/include/proc.h
index f4b59aa..4c2b244 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 94260f7..86dedbf 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 14f03b7..8fe7a6c 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 efd5e79..da88d2a 100644
--- a/sys/mips/include/proc.h
+++ b/sys/mips/include/proc.h
@@ -79,7 +79,6 @@ struct mdproc {
 	/* empty */
 };
 
-#ifdef _KERNEL
 struct syscall_args {
 	u_int code;
 	struct sysent *callp;
@@ -87,7 +86,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 4981581..d11cf88 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 <machine/pcb.h>
@@ -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 6732681..644bb91 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 4b5e1c9..8d1dec3 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 <machine/pcb.h>
@@ -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_ */