From 01ae5b20dfc9c6e6ce7f12008a14be9081a7aa9e Mon Sep 17 00:00:00 2001
From: David Greenman <dg@FreeBSD.org>
Date: Fri, 16 Jul 1993 20:50:44 +0000
Subject: [PATCH] Updated kernel files to move occurances of "struct args"
 syscall argument definitions outside of the function parameter list.  This is
 to reduce the copious warning messages that (non-Jolitz) gcc produces. Also
 fixed some bogus variable declarations and casts to make the compiler happy.

---
 sys/amd64/amd64/machdep.c     | 13 ++++++++-----
 sys/amd64/amd64/sys_machdep.c | 10 ++++++----
 sys/i386/i386/machdep.c       | 13 ++++++++-----
 sys/i386/i386/sys_machdep.c   | 10 ++++++----
 4 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index 076bad91c304..4070ad64242b 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -49,7 +49,7 @@
  * 20 Apr 93	Bruce Evans		New npx-0.5 code
  * 25 Apr 93	Bruce Evans		New intr-0.1 code
  */
-static char rcsid[] = "$Header: /home/cvs/386BSD/src/sys.386bsd/i386/i386/machdep.c,v 1.1.1.1 93/06/12 14:58:06 rgrimes Exp $";
+static char rcsid[] = "$Header: /a/cvs/386BSD/src/sys.386bsd/i386/i386/machdep.c,v 1.2 1993/06/18 02:47:10 paul Exp $";
 
 
 #include <stddef.h>
@@ -412,11 +412,14 @@ sendsig(catcher, sig, mask, code)
  * psl to gain improper priviledges or to cause
  * a machine fault.
  */
+
+struct sigreturn_args {
+	struct sigcontext *sigcntxp;
+};
+
 sigreturn(p, uap, retval)
 	struct proc *p;
-	struct args {
-		struct sigcontext *sigcntxp;
-	} *uap;
+	struct sigreturn_args *uap;
 	int *retval;
 {
 	register struct sigcontext *scp;
@@ -531,7 +534,7 @@ boot(arghowto)
 	/*NOTREACHED*/
 }
 
-int	dumpmag = 0x8fca0101;	/* magic number for savecore */
+u_int	dumpmag = 0x8fca0101;	/* magic number for savecore */
 int	dumpsize = 0;		/* also for savecore */
 /*
  * Doadump comes here after turning off memory management and
diff --git a/sys/amd64/amd64/sys_machdep.c b/sys/amd64/amd64/sys_machdep.c
index 10b9ac274b40..96c011997ec2 100644
--- a/sys/amd64/amd64/sys_machdep.c
+++ b/sys/amd64/amd64/sys_machdep.c
@@ -52,12 +52,14 @@
 #ifdef TRACE
 int	nvualarm;
 
+struct vtrace_args {
+	int	request;
+	int	value;
+};
+
 vtrace(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		int	request;
-		int	value;
-	} *uap;
+	register struct vtrace_args *uap;
 	int *retval;
 {
 	int vdoualarm();
diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index 076bad91c304..4070ad64242b 100644
--- a/sys/i386/i386/machdep.c
+++ b/sys/i386/i386/machdep.c
@@ -49,7 +49,7 @@
  * 20 Apr 93	Bruce Evans		New npx-0.5 code
  * 25 Apr 93	Bruce Evans		New intr-0.1 code
  */
-static char rcsid[] = "$Header: /home/cvs/386BSD/src/sys.386bsd/i386/i386/machdep.c,v 1.1.1.1 93/06/12 14:58:06 rgrimes Exp $";
+static char rcsid[] = "$Header: /a/cvs/386BSD/src/sys.386bsd/i386/i386/machdep.c,v 1.2 1993/06/18 02:47:10 paul Exp $";
 
 
 #include <stddef.h>
@@ -412,11 +412,14 @@ sendsig(catcher, sig, mask, code)
  * psl to gain improper priviledges or to cause
  * a machine fault.
  */
+
+struct sigreturn_args {
+	struct sigcontext *sigcntxp;
+};
+
 sigreturn(p, uap, retval)
 	struct proc *p;
-	struct args {
-		struct sigcontext *sigcntxp;
-	} *uap;
+	struct sigreturn_args *uap;
 	int *retval;
 {
 	register struct sigcontext *scp;
@@ -531,7 +534,7 @@ boot(arghowto)
 	/*NOTREACHED*/
 }
 
-int	dumpmag = 0x8fca0101;	/* magic number for savecore */
+u_int	dumpmag = 0x8fca0101;	/* magic number for savecore */
 int	dumpsize = 0;		/* also for savecore */
 /*
  * Doadump comes here after turning off memory management and
diff --git a/sys/i386/i386/sys_machdep.c b/sys/i386/i386/sys_machdep.c
index 10b9ac274b40..96c011997ec2 100644
--- a/sys/i386/i386/sys_machdep.c
+++ b/sys/i386/i386/sys_machdep.c
@@ -52,12 +52,14 @@
 #ifdef TRACE
 int	nvualarm;
 
+struct vtrace_args {
+	int	request;
+	int	value;
+};
+
 vtrace(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		int	request;
-		int	value;
-	} *uap;
+	register struct vtrace_args *uap;
 	int *retval;
 {
 	int vdoualarm();