Revert "MFC r319871:"

This reverts commit 045793a68906243d204d36b336867187c1a33f00.

7 files changed, 38 insertions, 28 deletions

diff --git a/sys/amd64/include/proc.h b/sys/amd64/include/proc.h
index 4c2b244..f4b59aa 100644
--- a/sys/amd64/include/proc.h
+++ b/sys/amd64/include/proc.h
@@ -70,13 +70,6 @@ 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. */
@@ -99,6 +92,13 @@ 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 86dedbf..94260f7 100644
--- a/sys/arm64/include/proc.h
+++ b/sys/arm64/include/proc.h
@@ -45,6 +45,8 @@ struct mdproc {
 
 #define	KINFO_PROC_SIZE	1088
 
+#ifdef _KERNEL
+
 #define	MAXARGS		8
 struct syscall_args {
 	u_int code;
@@ -53,4 +55,6 @@ 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 8fe7a6c..14f03b7 100644
--- a/sys/i386/include/proc.h
+++ b/sys/i386/include/proc.h
@@ -60,13 +60,6 @@ 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. */
@@ -84,6 +77,13 @@ 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 da88d2a..efd5e79 100644
--- a/sys/mips/include/proc.h
+++ b/sys/mips/include/proc.h
@@ -79,6 +79,7 @@ struct mdproc {
 	/* empty */
 };
 
+#ifdef _KERNEL
 struct syscall_args {
 	u_int code;
 	struct sysent *callp;
@@ -86,6 +87,7 @@ 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 d11cf88..4981581 100644
--- a/sys/powerpc/include/proc.h
+++ b/sys/powerpc/include/proc.h
@@ -53,13 +53,6 @@ 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>
@@ -72,6 +65,13 @@ struct syscall_args {
 	    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 644bb91..6732681 100644
--- a/sys/riscv/include/proc.h
+++ b/sys/riscv/include/proc.h
@@ -45,6 +45,8 @@ struct mdproc {
 
 #define	KINFO_PROC_SIZE	1088
 
+#ifdef _KERNEL
+
 #define	MAXARGS		8
 struct syscall_args {
 	u_int code;
@@ -53,4 +55,6 @@ 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 8d1dec3..4b5e1c9 100644
--- a/sys/sparc64/include/proc.h
+++ b/sys/sparc64/include/proc.h
@@ -53,13 +53,6 @@ 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>
@@ -73,6 +66,13 @@ struct syscall_args {
 	    (char *)&td;						\
 } while (0)
 
+struct syscall_args {
+	u_int code;
+	struct sysent *callp;
+	register_t args[8];
+	int narg;
+};
+
 #endif
 
 #endif /* !_MACHINE_PROC_H_ */