CVS commit: [matt-nb5-mips64] src/sys/arch/mips/mips

[Matt Thomas]

Module Name:    src
Committed By:   matt
Date:           Fri Dec 24 07:10:32 UTC 2010

Modified Files:
        src/sys/arch/mips/mips [matt-nb5-mips64]: compat_13_machdep.c
            cpu_exec.c

Log Message:
need to include <mips/locore.h> explicitly now.
Ansify cpu_exec.c


To generate a diff of this commit:
cvs rdiff -u -r1.16.20.4 -r1.16.20.5 \
    src/sys/arch/mips/mips/compat_13_machdep.c
cvs rdiff -u -r1.50.54.1.4.13 -r1.50.54.1.4.14 \
    src/sys/arch/mips/mips/cpu_exec.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/arch/mips/mips/compat_13_machdep.c
diff -u src/sys/arch/mips/mips/compat_13_machdep.c:1.16.20.4 src/sys/arch/mips/mips/compat_13_machdep.c:1.16.20.5
--- src/sys/arch/mips/mips/compat_13_machdep.c:1.16.20.4	Mon Feb  1 04:16:19 2010
+++ src/sys/arch/mips/mips/compat_13_machdep.c	Fri Dec 24 07:10:32 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: compat_13_machdep.c,v 1.16.20.4 2010/02/01 04:16:19 matt Exp $	*/
+/*	$NetBSD: compat_13_machdep.c,v 1.16.20.5 2010/12/24 07:10:32 matt Exp $	*/
 
 /*
  * Copyright 1996 The Board of Trustees of The Leland Stanford
@@ -15,7 +15,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: compat_13_machdep.c,v 1.16.20.4 2010/02/01 04:16:19 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_13_machdep.c,v 1.16.20.5 2010/12/24 07:10:32 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -30,6 +30,7 @@
 #include <compat/sys/signalvar.h>
 
 #include <mips/regnum.h>
+#include <mips/locore.h>
 
 #ifdef DEBUG
 extern int sigdebug;

Index: src/sys/arch/mips/mips/cpu_exec.c
diff -u src/sys/arch/mips/mips/cpu_exec.c:1.50.54.1.4.13 src/sys/arch/mips/mips/cpu_exec.c:1.50.54.1.4.14
--- src/sys/arch/mips/mips/cpu_exec.c:1.50.54.1.4.13	Mon Feb  1 04:16:19 2010
+++ src/sys/arch/mips/mips/cpu_exec.c	Fri Dec 24 07:10:32 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu_exec.c,v 1.50.54.1.4.13 2010/02/01 04:16:19 matt Exp $	*/
+/*	$NetBSD: cpu_exec.c,v 1.50.54.1.4.14 2010/12/24 07:10:32 matt Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu_exec.c,v 1.50.54.1.4.13 2010/02/01 04:16:19 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_exec.c,v 1.50.54.1.4.14 2010/12/24 07:10:32 matt Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_compat_ultrix.h"
@@ -61,6 +61,7 @@
 #endif
 #include <machine/reg.h>
 #include <mips/regnum.h>			/* symbolic register indices */
+#include <mips/locore.h>
 
 #include <compat/common/compat_util.h>
 
@@ -76,9 +77,7 @@
  *
  */
 int
-cpu_exec_aout_makecmds(l, epp)
-	struct lwp *l;
-	struct exec_package *epp;
+cpu_exec_aout_makecmds(struct lwp *l, struct exec_package *epp)
 {
 	int error;
 
@@ -127,10 +126,7 @@
 
 #ifdef EXEC_ECOFF
 void
-cpu_exec_ecoff_setregs(l, epp, stack)
-	struct lwp *l;
-	struct exec_package *epp;
-	vaddr_t stack;
+cpu_exec_ecoff_setregs(struct lwp *l, struct exec_package *epp, vaddr_t stack)
 {
 	struct ecoff_exechdr *execp = (struct ecoff_exechdr *)epp->ep_hdr;
 	struct trapframe *tf = l->l_md.md_utf;
@@ -145,9 +141,7 @@
  * Do any machine-dependent diddling of the exec package when doing ECOFF.
  */
 int
-cpu_exec_ecoff_probe(l, epp)
-	struct lwp *l;
-	struct exec_package *epp;
+cpu_exec_ecoff_probe(struct lwp *l, struct exec_package *epp)
 {
 
 	/* NetBSD/mips does not have native ECOFF binaries. */
@@ -163,9 +157,7 @@
  */
 
 int
-mips_elf_makecmds (l, epp)
-        struct lwp *l;
-        struct exec_package *epp;
+mips_elf_makecmds(struct lwp *l, struct exec_package *epp)
 {
 	Elf32_Ehdr *ex = (Elf32_Ehdr *)epp->ep_hdr;
 	Elf32_Phdr ph;