Module Name:    src
Committed By:   matt
Date:           Sat Aug 15 23:45:01 UTC 2009

Modified Files:
        src/sys/arch/alpha/alpha: core_machdep.c machdep.c
        src/sys/arch/amd64/amd64: machdep.c
        src/sys/arch/arm/arm: arm_machdep.c core_machdep.c
        src/sys/arch/cesfic/cesfic: machdep.c
        src/sys/arch/hp300/hp300: machdep.c
        src/sys/arch/hp700/hp700: machdep.c
        src/sys/arch/hppa/hppa: core_machdep.c
        src/sys/arch/luna68k/luna68k: machdep.c
        src/sys/arch/m68k/m68k: core_machdep.c
        src/sys/arch/mac68k/mac68k: machdep.c
        src/sys/arch/mvme68k/mvme68k: machdep.c
        src/sys/arch/news68k/news68k: machdep.c
        src/sys/arch/next68k/next68k: machdep.c
        src/sys/arch/pmax/pmax: machdep.c
        src/sys/arch/powerpc/powerpc: core_machdep.c
        src/sys/arch/sh3/sh3: core_machdep.c
        src/sys/arch/sparc/sparc: core_machdep.c machdep.c pmap.c
        src/sys/arch/sparc64/sparc64: core_machdep.c machdep.c
            netbsd32_machdep.c pmap.c
        src/sys/arch/sun2/sun2: machdep.c
        src/sys/arch/sun3/sun3: machdep.c
        src/sys/arch/sun3/sun3x: machdep.c
        src/sys/arch/vax/vax: core_machdep.c vm_machdep.c
        src/sys/arch/x68k/x68k: machdep.c
        src/sys/arch/x86/x86: core_machdep.c

Log Message:
Include <sys/exec_aout.h> explicitly instead of relying on <sys/exec.h> to
do it for us.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/alpha/alpha/core_machdep.c
cvs rdiff -u -r1.319 -r1.320 src/sys/arch/alpha/alpha/machdep.c
cvs rdiff -u -r1.130 -r1.131 src/sys/arch/amd64/amd64/machdep.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/arm/arm/arm_machdep.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/arm/core_machdep.c
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/cesfic/cesfic/machdep.c
cvs rdiff -u -r1.206 -r1.207 src/sys/arch/hp300/hp300/machdep.c
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/hp700/hp700/machdep.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hppa/hppa/core_machdep.c
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/luna68k/luna68k/machdep.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/m68k/m68k/core_machdep.c
cvs rdiff -u -r1.330 -r1.331 src/sys/arch/mac68k/mac68k/machdep.c
cvs rdiff -u -r1.138 -r1.139 src/sys/arch/mvme68k/mvme68k/machdep.c
cvs rdiff -u -r1.80 -r1.81 src/sys/arch/news68k/news68k/machdep.c
cvs rdiff -u -r1.93 -r1.94 src/sys/arch/next68k/next68k/machdep.c
cvs rdiff -u -r1.234 -r1.235 src/sys/arch/pmax/pmax/machdep.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/powerpc/powerpc/core_machdep.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/sh3/sh3/core_machdep.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/sparc/sparc/core_machdep.c
cvs rdiff -u -r1.294 -r1.295 src/sys/arch/sparc/sparc/machdep.c
cvs rdiff -u -r1.331 -r1.332 src/sys/arch/sparc/sparc/pmap.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/sparc64/sparc64/core_machdep.c
cvs rdiff -u -r1.243 -r1.244 src/sys/arch/sparc64/sparc64/machdep.c
cvs rdiff -u -r1.87 -r1.88 src/sys/arch/sparc64/sparc64/netbsd32_machdep.c
cvs rdiff -u -r1.237 -r1.238 src/sys/arch/sparc64/sparc64/pmap.c
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/sun2/sun2/machdep.c
cvs rdiff -u -r1.192 -r1.193 src/sys/arch/sun3/sun3/machdep.c
cvs rdiff -u -r1.118 -r1.119 src/sys/arch/sun3/sun3x/machdep.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/vax/vax/core_machdep.c
cvs rdiff -u -r1.106 -r1.107 src/sys/arch/vax/vax/vm_machdep.c
cvs rdiff -u -r1.161 -r1.162 src/sys/arch/x68k/x68k/machdep.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/x86/x86/core_machdep.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/alpha/alpha/core_machdep.c
diff -u src/sys/arch/alpha/alpha/core_machdep.c:1.1 src/sys/arch/alpha/alpha/core_machdep.c:1.2
--- src/sys/arch/alpha/alpha/core_machdep.c:1.1	Wed Nov 19 18:35:57 2008
+++ src/sys/arch/alpha/alpha/core_machdep.c	Sat Aug 15 23:44:57 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: core_machdep.c,v 1.1 2008/11/19 18:35:57 ad Exp $ */
+/* $NetBSD: core_machdep.c,v 1.2 2009/08/15 23:44:57 matt Exp $ */
 
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: core_machdep.c,v 1.1 2008/11/19 18:35:57 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: core_machdep.c,v 1.2 2009/08/15 23:44:57 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -41,6 +41,8 @@
 #include <sys/core.h>
 #include <sys/exec.h>
 
+#include <sys/exec_aout.h>
+
 #include <uvm/uvm_extern.h>
 
 #include <machine/cpu.h>

Index: src/sys/arch/alpha/alpha/machdep.c
diff -u src/sys/arch/alpha/alpha/machdep.c:1.319 src/sys/arch/alpha/alpha/machdep.c:1.320
--- src/sys/arch/alpha/alpha/machdep.c:1.319	Wed Mar 18 10:22:22 2009
+++ src/sys/arch/alpha/alpha/machdep.c	Sat Aug 15 23:44:58 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.319 2009/03/18 10:22:22 cegger Exp $ */
+/* $NetBSD: machdep.c,v 1.320 2009/08/15 23:44:58 matt Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.319 2009/03/18 10:22:22 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.320 2009/08/15 23:44:58 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -89,6 +89,7 @@
 #include <sys/tty.h>
 #include <sys/user.h>
 #include <sys/exec.h>
+#include <sys/exec_aout.h>		/* for MID_* */
 #include <sys/exec_ecoff.h>
 #include <sys/core.h>
 #include <sys/kcore.h>

Index: src/sys/arch/amd64/amd64/machdep.c
diff -u src/sys/arch/amd64/amd64/machdep.c:1.130 src/sys/arch/amd64/amd64/machdep.c:1.131
--- src/sys/arch/amd64/amd64/machdep.c:1.130	Sun Mar 22 19:57:11 2009
+++ src/sys/arch/amd64/amd64/machdep.c	Sat Aug 15 23:44:58 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.130 2009/03/22 19:57:11 ad Exp $	*/
+/*	$NetBSD: machdep.c,v 1.131 2009/08/15 23:44:58 matt Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2000, 2006, 2007, 2008
@@ -112,7 +112,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.130 2009/03/22 19:57:11 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.131 2009/08/15 23:44:58 matt Exp $");
 
 /* #define XENDEBUG_LOW  */
 
@@ -138,6 +138,7 @@
 #include <sys/cpu.h>
 #include <sys/user.h>
 #include <sys/exec.h>
+#include <sys/exec_aout.h>	/* for MID_* */
 #include <sys/reboot.h>
 #include <sys/conf.h>
 #include <sys/mbuf.h>

Index: src/sys/arch/arm/arm/arm_machdep.c
diff -u src/sys/arch/arm/arm/arm_machdep.c:1.24 src/sys/arch/arm/arm/arm_machdep.c:1.25
--- src/sys/arch/arm/arm/arm_machdep.c:1.24	Fri Jan 16 01:03:47 2009
+++ src/sys/arch/arm/arm/arm_machdep.c	Sat Aug 15 23:44:58 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: arm_machdep.c,v 1.24 2009/01/16 01:03:47 bjh21 Exp $	*/
+/*	$NetBSD: arm_machdep.c,v 1.25 2009/08/15 23:44:58 matt Exp $	*/
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -79,7 +79,7 @@
 
 #include <sys/param.h>
 
-__KERNEL_RCSID(0, "$NetBSD: arm_machdep.c,v 1.24 2009/01/16 01:03:47 bjh21 Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arm_machdep.c,v 1.25 2009/08/15 23:44:58 matt Exp $");
 
 #include <sys/exec.h>
 #include <sys/proc.h>
@@ -91,6 +91,10 @@
 #include <sys/cpu.h>
 #include <sys/savar.h>
 
+#ifdef EXEC_AOUT
+#include <sys/exec_aout.h>
+#endif
+
 #include <arm/cpufunc.h>
 
 #include <machine/pcb.h>

Index: src/sys/arch/arm/arm/core_machdep.c
diff -u src/sys/arch/arm/arm/core_machdep.c:1.1 src/sys/arch/arm/arm/core_machdep.c:1.2
--- src/sys/arch/arm/arm/core_machdep.c:1.1	Wed Nov 19 18:35:58 2008
+++ src/sys/arch/arm/arm/core_machdep.c	Sat Aug 15 23:44:58 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: core_machdep.c,v 1.1 2008/11/19 18:35:58 ad Exp $	*/
+/*	$NetBSD: core_machdep.c,v 1.2 2009/08/15 23:44:58 matt Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -37,7 +37,7 @@
 
 #include <sys/param.h>
 
-__KERNEL_RCSID(0, "$NetBSD: core_machdep.c,v 1.1 2008/11/19 18:35:58 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: core_machdep.c,v 1.2 2009/08/15 23:44:58 matt Exp $");
 
 #include <sys/core.h>
 #include <sys/exec.h>
@@ -47,6 +47,8 @@
 #include <sys/uio.h>
 #include <sys/vnode.h>
 
+#include <sys/exec_aout.h>	/* for MID_* */
+
 #include <machine/reg.h>
 
 

Index: src/sys/arch/cesfic/cesfic/machdep.c
diff -u src/sys/arch/cesfic/cesfic/machdep.c:1.49 src/sys/arch/cesfic/cesfic/machdep.c:1.50
--- src/sys/arch/cesfic/cesfic/machdep.c:1.49	Wed Mar 18 10:22:27 2009
+++ src/sys/arch/cesfic/cesfic/machdep.c	Sat Aug 15 23:44:58 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.49 2009/03/18 10:22:27 cegger Exp $	*/
+/*	$NetBSD: machdep.c,v 1.50 2009/08/15 23:44:58 matt Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -77,7 +77,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.49 2009/03/18 10:22:27 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.50 2009/08/15 23:44:58 matt Exp $");
 
 #include "opt_bufcache.h"
 #include "opt_ddb.h"
@@ -92,6 +92,7 @@
 #include <sys/callout.h>
 #include <sys/conf.h>
 #include <sys/exec.h>
+#include <sys/exec_aout.h>		/* for MID_* */
 #include <sys/file.h>
 #include <sys/ioctl.h>
 #include <sys/kernel.h>

Index: src/sys/arch/hp300/hp300/machdep.c
diff -u src/sys/arch/hp300/hp300/machdep.c:1.206 src/sys/arch/hp300/hp300/machdep.c:1.207
--- src/sys/arch/hp300/hp300/machdep.c:1.206	Fri Feb 13 22:41:01 2009
+++ src/sys/arch/hp300/hp300/machdep.c	Sat Aug 15 23:44:58 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.206 2009/02/13 22:41:01 apb Exp $	*/
+/*	$NetBSD: machdep.c,v 1.207 2009/08/15 23:44:58 matt Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -77,7 +77,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.206 2009/02/13 22:41:01 apb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.207 2009/08/15 23:44:58 matt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_compat_netbsd.h"
@@ -91,6 +91,7 @@
 #include <sys/buf.h>
 #include <sys/conf.h>
 #include <sys/exec.h>
+#include <sys/exec_aout.h>		/* for MID_* */
 #include <sys/file.h>
 #include <sys/ioctl.h>
 #include <sys/kernel.h>

Index: src/sys/arch/hp700/hp700/machdep.c
diff -u src/sys/arch/hp700/hp700/machdep.c:1.69 src/sys/arch/hp700/hp700/machdep.c:1.70
--- src/sys/arch/hp700/hp700/machdep.c:1.69	Fri May 29 08:44:29 2009
+++ src/sys/arch/hp700/hp700/machdep.c	Sat Aug 15 23:44:58 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.69 2009/05/29 08:44:29 skrll Exp $	*/
+/*	$NetBSD: machdep.c,v 1.70 2009/08/15 23:44:58 matt Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.69 2009/05/29 08:44:29 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.70 2009/08/15 23:44:58 matt Exp $");
 
 #include "opt_cputype.h"
 #include "opt_ddb.h"
@@ -84,6 +84,7 @@
 #include <sys/tty.h>
 #include <sys/user.h>
 #include <sys/exec.h>
+#include <sys/exec_aout.h>		/* for MID_* */
 #include <sys/sysctl.h>
 #include <sys/core.h>
 #include <sys/kcore.h>

Index: src/sys/arch/hppa/hppa/core_machdep.c
diff -u src/sys/arch/hppa/hppa/core_machdep.c:1.1 src/sys/arch/hppa/hppa/core_machdep.c:1.2
--- src/sys/arch/hppa/hppa/core_machdep.c:1.1	Wed Nov 19 18:35:58 2008
+++ src/sys/arch/hppa/hppa/core_machdep.c	Sat Aug 15 23:44:58 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: core_machdep.c,v 1.1 2008/11/19 18:35:58 ad Exp $	*/
+/*	$NetBSD: core_machdep.c,v 1.2 2009/08/15 23:44:58 matt Exp $	*/
 
 /*	$OpenBSD: vm_machdep.c,v 1.25 2001/09/19 20:50:56 mickey Exp $	*/
 
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: core_machdep.c,v 1.1 2008/11/19 18:35:58 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: core_machdep.c,v 1.2 2009/08/15 23:44:58 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -48,6 +48,8 @@
 #include <sys/exec.h>
 #include <sys/core.h>
 
+#include <sys/exec_aout.h>
+
 #include <machine/cpufunc.h>
 #include <machine/pmap.h>
 #include <machine/pcb.h>

Index: src/sys/arch/luna68k/luna68k/machdep.c
diff -u src/sys/arch/luna68k/luna68k/machdep.c:1.69 src/sys/arch/luna68k/luna68k/machdep.c:1.70
--- src/sys/arch/luna68k/luna68k/machdep.c:1.69	Wed Mar 18 17:06:45 2009
+++ src/sys/arch/luna68k/luna68k/machdep.c	Sat Aug 15 23:44:59 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.69 2009/03/18 17:06:45 cegger Exp $ */
+/* $NetBSD: machdep.c,v 1.70 2009/08/15 23:44:59 matt Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.69 2009/03/18 17:06:45 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.70 2009/08/15 23:44:59 matt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -56,6 +56,7 @@
 #include <sys/mount.h>
 #include <sys/user.h>
 #include <sys/exec.h>
+#include <sys/exec_aout.h>		/* for MID_* */
 #include <sys/core.h>
 #include <sys/kcore.h>
 #include <sys/vnode.h>

Index: src/sys/arch/m68k/m68k/core_machdep.c
diff -u src/sys/arch/m68k/m68k/core_machdep.c:1.1 src/sys/arch/m68k/m68k/core_machdep.c:1.2
--- src/sys/arch/m68k/m68k/core_machdep.c:1.1	Wed Nov 19 18:35:59 2008
+++ src/sys/arch/m68k/m68k/core_machdep.c	Sat Aug 15 23:44:59 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: core_machdep.c,v 1.1 2008/11/19 18:35:59 ad Exp $	*/
+/*	$NetBSD: core_machdep.c,v 1.2 2009/08/15 23:44:59 matt Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -77,7 +77,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: core_machdep.c,v 1.1 2008/11/19 18:35:59 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: core_machdep.c,v 1.2 2009/08/15 23:44:59 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -89,6 +89,8 @@
 #include <sys/core.h>
 #include <sys/exec.h>
 
+#include <sys/exec_aout.h>
+
 #include <machine/frame.h>
 #include <machine/cpu.h>
 #include <machine/pte.h>

Index: src/sys/arch/mac68k/mac68k/machdep.c
diff -u src/sys/arch/mac68k/mac68k/machdep.c:1.330 src/sys/arch/mac68k/mac68k/machdep.c:1.331
--- src/sys/arch/mac68k/mac68k/machdep.c:1.330	Wed Mar 18 17:06:45 2009
+++ src/sys/arch/mac68k/mac68k/machdep.c	Sat Aug 15 23:44:59 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.330 2009/03/18 17:06:45 cegger Exp $	*/
+/*	$NetBSD: machdep.c,v 1.331 2009/08/15 23:44:59 matt Exp $	*/
 
 /*
  * Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -107,7 +107,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.330 2009/03/18 17:06:45 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.331 2009/08/15 23:44:59 matt Exp $");
 
 #include "opt_adb.h"
 #include "opt_ddb.h"
@@ -125,6 +125,7 @@
 #include <sys/conf.h>
 #include <sys/core.h>
 #include <sys/exec.h>
+#include <sys/exec_aout.h>		/* for MID_* */
 #include <sys/extent.h>
 #include <sys/file.h>
 #include <sys/kcore.h>

Index: src/sys/arch/mvme68k/mvme68k/machdep.c
diff -u src/sys/arch/mvme68k/mvme68k/machdep.c:1.138 src/sys/arch/mvme68k/mvme68k/machdep.c:1.139
--- src/sys/arch/mvme68k/mvme68k/machdep.c:1.138	Sat Aug 15 19:16:45 2009
+++ src/sys/arch/mvme68k/mvme68k/machdep.c	Sat Aug 15 23:44:59 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.138 2009/08/15 19:16:45 snj Exp $	*/
+/*	$NetBSD: machdep.c,v 1.139 2009/08/15 23:44:59 matt Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -77,7 +77,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.138 2009/08/15 19:16:45 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.139 2009/08/15 23:44:59 matt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_m060sp.h"
@@ -101,6 +101,7 @@
 #include <sys/mount.h>
 #include <sys/user.h>
 #include <sys/exec.h>
+#include <sys/exec_aout.h>		/* for MID_* */
 #include <sys/core.h>
 #include <sys/kcore.h>
 #include <sys/vnode.h>

Index: src/sys/arch/news68k/news68k/machdep.c
diff -u src/sys/arch/news68k/news68k/machdep.c:1.80 src/sys/arch/news68k/news68k/machdep.c:1.81
--- src/sys/arch/news68k/news68k/machdep.c:1.80	Fri Feb 13 22:41:02 2009
+++ src/sys/arch/news68k/news68k/machdep.c	Sat Aug 15 23:44:59 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.80 2009/02/13 22:41:02 apb Exp $	*/
+/*	$NetBSD: machdep.c,v 1.81 2009/08/15 23:44:59 matt Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -77,7 +77,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.80 2009/02/13 22:41:02 apb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.81 2009/08/15 23:44:59 matt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_compat_netbsd.h"
@@ -98,6 +98,7 @@
 #include <sys/tty.h>
 #include <sys/user.h>
 #include <sys/exec.h>
+#include <sys/exec_aout.h>		/* for MID_* */
 #include <sys/core.h>
 #include <sys/kcore.h>
 #include <sys/ksyms.h>

Index: src/sys/arch/next68k/next68k/machdep.c
diff -u src/sys/arch/next68k/next68k/machdep.c:1.93 src/sys/arch/next68k/next68k/machdep.c:1.94
--- src/sys/arch/next68k/next68k/machdep.c:1.93	Wed Mar 18 17:06:46 2009
+++ src/sys/arch/next68k/next68k/machdep.c	Sat Aug 15 23:44:59 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.93 2009/03/18 17:06:46 cegger Exp $	*/
+/*	$NetBSD: machdep.c,v 1.94 2009/08/15 23:44:59 matt Exp $	*/
 
 /*
  * Copyright (c) 1998 Darrin B. Jewell
@@ -79,7 +79,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.93 2009/03/18 17:06:46 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.94 2009/08/15 23:44:59 matt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -103,6 +103,7 @@
 #include <sys/mount.h>
 #include <sys/user.h>
 #include <sys/exec.h>
+#include <sys/exec_aout.h>		/* for MID_* */
 #include <sys/core.h>
 #include <sys/kcore.h>
 #include <sys/vnode.h>

Index: src/sys/arch/pmax/pmax/machdep.c
diff -u src/sys/arch/pmax/pmax/machdep.c:1.234 src/sys/arch/pmax/pmax/machdep.c:1.235
--- src/sys/arch/pmax/pmax/machdep.c:1.234	Tue Jul 21 15:10:39 2009
+++ src/sys/arch/pmax/pmax/machdep.c	Sat Aug 15 23:44:59 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.234 2009/07/21 15:10:39 tsutsui Exp $	*/
+/*	$NetBSD: machdep.c,v 1.235 2009/08/15 23:44:59 matt Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -77,7 +77,7 @@
  */
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.234 2009/07/21 15:10:39 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.235 2009/08/15 23:44:59 matt Exp $");
 
 #include "fs_mfs.h"
 #include "opt_ddb.h"
@@ -115,7 +115,6 @@
 #include <machine/bus.h>
 
 #if NKSYMS || defined(DDB) || defined(MODULAR)
-#include <sys/exec_aout.h>		/* XXX backwards compatilbity for DDB */
 #include <machine/db_machdep.h>
 #include <ddb/db_extern.h>
 #endif

Index: src/sys/arch/powerpc/powerpc/core_machdep.c
diff -u src/sys/arch/powerpc/powerpc/core_machdep.c:1.2 src/sys/arch/powerpc/powerpc/core_machdep.c:1.3
--- src/sys/arch/powerpc/powerpc/core_machdep.c:1.2	Fri Nov 21 20:21:47 2008
+++ src/sys/arch/powerpc/powerpc/core_machdep.c	Sat Aug 15 23:45:00 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: core_machdep.c,v 1.2 2008/11/21 20:21:47 he Exp $	*/
+/*	$NetBSD: core_machdep.c,v 1.3 2009/08/15 23:45:00 matt Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: core_machdep.c,v 1.2 2008/11/21 20:21:47 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: core_machdep.c,v 1.3 2009/08/15 23:45:00 matt Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_altivec.h"
@@ -47,6 +47,8 @@
 #include <sys/user.h>
 #include <sys/vnode.h>
 
+#include <sys/exec_aout.h>
+
 #include <uvm/uvm_extern.h>
 
 #ifdef ALTIVEC

Index: src/sys/arch/sh3/sh3/core_machdep.c
diff -u src/sys/arch/sh3/sh3/core_machdep.c:1.1 src/sys/arch/sh3/sh3/core_machdep.c:1.2
--- src/sys/arch/sh3/sh3/core_machdep.c:1.1	Wed Nov 19 18:36:00 2008
+++ src/sys/arch/sh3/sh3/core_machdep.c	Sat Aug 15 23:45:00 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: core_machdep.c,v 1.1 2008/11/19 18:36:00 ad Exp $	*/
+/*	$NetBSD: core_machdep.c,v 1.2 2009/08/15 23:45:00 matt Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc. All rights reserved.
@@ -81,7 +81,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: core_machdep.c,v 1.1 2008/11/19 18:36:00 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: core_machdep.c,v 1.2 2009/08/15 23:45:00 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -96,6 +96,8 @@
 #include <sys/syscall.h>
 #include <sys/ktrace.h>
 
+#include <sys/exec_aout.h>
+
 #include <uvm/uvm_extern.h>
 
 #include <sh3/locore.h>

Index: src/sys/arch/sparc/sparc/core_machdep.c
diff -u src/sys/arch/sparc/sparc/core_machdep.c:1.2 src/sys/arch/sparc/sparc/core_machdep.c:1.3
--- src/sys/arch/sparc/sparc/core_machdep.c:1.2	Wed Mar 18 16:00:14 2009
+++ src/sys/arch/sparc/sparc/core_machdep.c	Sat Aug 15 23:45:00 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: core_machdep.c,v 1.2 2009/03/18 16:00:14 cegger Exp $ */
+/*	$NetBSD: core_machdep.c,v 1.3 2009/08/15 23:45:00 matt Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -49,7 +49,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: core_machdep.c,v 1.2 2009/03/18 16:00:14 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: core_machdep.c,v 1.3 2009/08/15 23:45:00 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -62,6 +62,8 @@
 #include <sys/vnode.h>
 #include <sys/simplelock.h>
 
+#include <sys/exec_aout.h>
+
 #include <uvm/uvm_extern.h>
 
 #include <machine/cpu.h>

Index: src/sys/arch/sparc/sparc/machdep.c
diff -u src/sys/arch/sparc/sparc/machdep.c:1.294 src/sys/arch/sparc/sparc/machdep.c:1.295
--- src/sys/arch/sparc/sparc/machdep.c:1.294	Tue May 26 03:30:24 2009
+++ src/sys/arch/sparc/sparc/machdep.c	Sat Aug 15 23:45:00 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.294 2009/05/26 03:30:24 macallan Exp $ */
+/*	$NetBSD: machdep.c,v 1.295 2009/08/15 23:45:00 matt Exp $ */
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.294 2009/05/26 03:30:24 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.295 2009/08/15 23:45:00 matt Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_compat_sunos.h"
@@ -99,6 +99,7 @@
 #include <sys/msgbuf.h>
 #include <sys/syscallargs.h>
 #include <sys/exec.h>
+#include <sys/exec_aout.h>
 #include <sys/ucontext.h>
 #include <sys/simplelock.h>
 #include <sys/module.h>

Index: src/sys/arch/sparc/sparc/pmap.c
diff -u src/sys/arch/sparc/sparc/pmap.c:1.331 src/sys/arch/sparc/sparc/pmap.c:1.332
--- src/sys/arch/sparc/sparc/pmap.c:1.331	Sun May 31 20:28:51 2009
+++ src/sys/arch/sparc/sparc/pmap.c	Sat Aug 15 23:45:00 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.331 2009/05/31 20:28:51 mrg Exp $ */
+/*	$NetBSD: pmap.c,v 1.332 2009/08/15 23:45:00 matt Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -56,7 +56,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.331 2009/05/31 20:28:51 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.332 2009/08/15 23:45:00 matt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -74,6 +74,8 @@
 #include <sys/kernel.h>
 #include <sys/atomic.h>
 
+#include <sys/exec_aout.h>		/* for MID_* */
+
 #include <uvm/uvm.h>
 
 #include <machine/autoconf.h>

Index: src/sys/arch/sparc64/sparc64/core_machdep.c
diff -u src/sys/arch/sparc64/sparc64/core_machdep.c:1.1 src/sys/arch/sparc64/sparc64/core_machdep.c:1.2
--- src/sys/arch/sparc64/sparc64/core_machdep.c:1.1	Wed Nov 19 18:36:01 2008
+++ src/sys/arch/sparc64/sparc64/core_machdep.c	Sat Aug 15 23:45:00 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: core_machdep.c,v 1.1 2008/11/19 18:36:01 ad Exp $ */
+/*	$NetBSD: core_machdep.c,v 1.2 2009/08/15 23:45:00 matt Exp $ */
 
 /*
  * Copyright (c) 1996-2002 Eduardo Horvath.  All rights reserved.
@@ -50,7 +50,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: core_machdep.c,v 1.1 2008/11/19 18:36:01 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: core_machdep.c,v 1.2 2009/08/15 23:45:00 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -61,6 +61,8 @@
 #include <sys/exec.h>
 #include <sys/vnode.h>
 
+#include <sys/exec_aout.h>
+
 #include <uvm/uvm_extern.h>
 
 #include <machine/cpu.h>

Index: src/sys/arch/sparc64/sparc64/machdep.c
diff -u src/sys/arch/sparc64/sparc64/machdep.c:1.243 src/sys/arch/sparc64/sparc64/machdep.c:1.244
--- src/sys/arch/sparc64/sparc64/machdep.c:1.243	Fri Jun 26 23:40:27 2009
+++ src/sys/arch/sparc64/sparc64/machdep.c	Sat Aug 15 23:45:00 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.243 2009/06/26 23:40:27 dyoung Exp $ */
+/*	$NetBSD: machdep.c,v 1.244 2009/08/15 23:45:00 matt Exp $ */
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.243 2009/06/26 23:40:27 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.244 2009/08/15 23:45:00 matt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_multiprocessor.h"
@@ -105,6 +105,8 @@
 #include <sys/cpu.h>
 #include <sys/module.h>
 
+#include <sys/exec_aout.h>
+
 #include <uvm/uvm.h>
 
 #include <sys/sysctl.h>

Index: src/sys/arch/sparc64/sparc64/netbsd32_machdep.c
diff -u src/sys/arch/sparc64/sparc64/netbsd32_machdep.c:1.87 src/sys/arch/sparc64/sparc64/netbsd32_machdep.c:1.88
--- src/sys/arch/sparc64/sparc64/netbsd32_machdep.c:1.87	Fri Feb 13 22:41:03 2009
+++ src/sys/arch/sparc64/sparc64/netbsd32_machdep.c	Sat Aug 15 23:45:00 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32_machdep.c,v 1.87 2009/02/13 22:41:03 apb Exp $	*/
+/*	$NetBSD: netbsd32_machdep.c,v 1.88 2009/08/15 23:45:00 matt Exp $	*/
 
 /*
  * Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,12 +27,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.87 2009/02/13 22:41:03 apb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.88 2009/08/15 23:45:00 matt Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
 #include "opt_compat_sunos.h"
 #include "opt_modular.h"
+#include "opt_execfmt.h"
 #include "firm_events.h"
 #endif
 

Index: src/sys/arch/sparc64/sparc64/pmap.c
diff -u src/sys/arch/sparc64/sparc64/pmap.c:1.237 src/sys/arch/sparc64/sparc64/pmap.c:1.238
--- src/sys/arch/sparc64/sparc64/pmap.c:1.237	Sun Aug  9 13:15:05 2009
+++ src/sys/arch/sparc64/sparc64/pmap.c	Sat Aug 15 23:45:00 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.237 2009/08/09 13:15:05 martin Exp $	*/
+/*	$NetBSD: pmap.c,v 1.238 2009/08/15 23:45:00 matt Exp $	*/
 /*
  *
  * Copyright (C) 1996-1999 Eduardo Horvath.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.237 2009/08/09 13:15:05 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.238 2009/08/15 23:45:00 matt Exp $");
 
 #undef	NO_VCACHE /* Don't forget the locked TLB in dostart */
 #define	HWREF
@@ -47,6 +47,8 @@
 #include <sys/atomic.h>
 #include <sys/cpu.h>
 
+#include <sys/exec_aout.h>	/* for MID_* */
+
 #include <uvm/uvm.h>
 
 #include <machine/pcb.h>

Index: src/sys/arch/sun2/sun2/machdep.c
diff -u src/sys/arch/sun2/sun2/machdep.c:1.60 src/sys/arch/sun2/sun2/machdep.c:1.61
--- src/sys/arch/sun2/sun2/machdep.c:1.60	Fri Feb 13 22:41:03 2009
+++ src/sys/arch/sun2/sun2/machdep.c	Sat Aug 15 23:45:00 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.60 2009/02/13 22:41:03 apb Exp $	*/
+/*	$NetBSD: machdep.c,v 1.61 2009/08/15 23:45:00 matt Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -153,7 +153,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.60 2009/02/13 22:41:03 apb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.61 2009/08/15 23:45:00 matt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -178,6 +178,7 @@
 #include <sys/mount.h>
 #include <sys/user.h>
 #include <sys/exec.h>
+#include <sys/exec_aout.h>		/* for MID_* */
 #include <sys/core.h>
 #include <sys/kcore.h>
 #include <sys/vnode.h>

Index: src/sys/arch/sun3/sun3/machdep.c
diff -u src/sys/arch/sun3/sun3/machdep.c:1.192 src/sys/arch/sun3/sun3/machdep.c:1.193
--- src/sys/arch/sun3/sun3/machdep.c:1.192	Fri Feb 13 22:41:03 2009
+++ src/sys/arch/sun3/sun3/machdep.c	Sat Aug 15 23:45:01 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.192 2009/02/13 22:41:03 apb Exp $	*/
+/*	$NetBSD: machdep.c,v 1.193 2009/08/15 23:45:01 matt Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -78,7 +78,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.192 2009/02/13 22:41:03 apb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.193 2009/08/15 23:45:01 matt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -101,6 +101,7 @@
 #include <sys/mount.h>
 #include <sys/user.h>
 #include <sys/exec.h>
+#include <sys/exec_aout.h>		/* for MID_* */
 #include <sys/core.h>
 #include <sys/kcore.h>
 #include <sys/vnode.h>

Index: src/sys/arch/sun3/sun3x/machdep.c
diff -u src/sys/arch/sun3/sun3x/machdep.c:1.118 src/sys/arch/sun3/sun3x/machdep.c:1.119
--- src/sys/arch/sun3/sun3x/machdep.c:1.118	Fri Feb 13 22:41:03 2009
+++ src/sys/arch/sun3/sun3x/machdep.c	Sat Aug 15 23:45:01 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.118 2009/02/13 22:41:03 apb Exp $	*/
+/*	$NetBSD: machdep.c,v 1.119 2009/08/15 23:45:01 matt Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -75,7 +75,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.118 2009/02/13 22:41:03 apb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.119 2009/08/15 23:45:01 matt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -98,6 +98,7 @@
 #include <sys/mount.h>
 #include <sys/user.h>
 #include <sys/exec.h>
+#include <sys/exec_aout.h>		/* for MID_* */
 #include <sys/core.h>
 #include <sys/kcore.h>
 #include <sys/vnode.h>

Index: src/sys/arch/vax/vax/core_machdep.c
diff -u src/sys/arch/vax/vax/core_machdep.c:1.1 src/sys/arch/vax/vax/core_machdep.c:1.2
--- src/sys/arch/vax/vax/core_machdep.c:1.1	Wed Nov 19 18:36:01 2008
+++ src/sys/arch/vax/vax/core_machdep.c	Sat Aug 15 23:45:01 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: core_machdep.c,v 1.1 2008/11/19 18:36:01 ad Exp $	     */
+/*	$NetBSD: core_machdep.c,v 1.2 2009/08/15 23:45:01 matt Exp $	     */
 
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: core_machdep.c,v 1.1 2008/11/19 18:36:01 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: core_machdep.c,v 1.2 2009/08/15 23:45:01 matt Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -44,6 +44,8 @@
 #include <sys/mount.h>
 #include <sys/device.h>
 
+#include <sys/exec_aout.h>
+
 #include <uvm/uvm_extern.h>
 
 #include <machine/vmparam.h>

Index: src/sys/arch/vax/vax/vm_machdep.c
diff -u src/sys/arch/vax/vax/vm_machdep.c:1.106 src/sys/arch/vax/vax/vm_machdep.c:1.107
--- src/sys/arch/vax/vax/vm_machdep.c:1.106	Sat Mar 14 14:46:07 2009
+++ src/sys/arch/vax/vax/vm_machdep.c	Sat Aug 15 23:45:01 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: vm_machdep.c,v 1.106 2009/03/14 14:46:07 dsl Exp $	     */
+/*	$NetBSD: vm_machdep.c,v 1.107 2009/08/15 23:45:01 matt Exp $	     */
 
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
@@ -31,8 +31,9 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.106 2009/03/14 14:46:07 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.107 2009/08/15 23:45:01 matt Exp $");
 
+#include "opt_execfmt.h"
 #include "opt_compat_ultrix.h"
 #include "opt_multiprocessor.h"
 #include "opt_sa.h"
@@ -43,6 +44,7 @@
 #include <sys/proc.h>
 #include <sys/user.h>
 #include <sys/exec.h>
+#include <sys/exec_aout.h>
 #include <sys/vnode.h>
 #include <sys/core.h>
 #include <sys/mount.h>
@@ -199,11 +201,13 @@
 }
 #endif
 
+#ifdef EXEC_AOUT
 int
 cpu_exec_aout_makecmds(struct lwp *l, struct exec_package *epp)
 {
 	return ENOEXEC;
 }
+#endif
 
 int
 sys_sysarch(struct lwp *l, const struct sys_sysarch_args *uap, register_t *retval)

Index: src/sys/arch/x68k/x68k/machdep.c
diff -u src/sys/arch/x68k/x68k/machdep.c:1.161 src/sys/arch/x68k/x68k/machdep.c:1.162
--- src/sys/arch/x68k/x68k/machdep.c:1.161	Fri Feb 13 22:41:03 2009
+++ src/sys/arch/x68k/x68k/machdep.c	Sat Aug 15 23:45:01 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.161 2009/02/13 22:41:03 apb Exp $	*/
+/*	$NetBSD: machdep.c,v 1.162 2009/08/15 23:45:01 matt Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -77,7 +77,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.161 2009/02/13 22:41:03 apb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.162 2009/08/15 23:45:01 matt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -107,6 +107,7 @@
 #include <sys/mount.h>
 #include <sys/user.h>
 #include <sys/exec.h>
+#include <sys/exec_aout.h>		/* for MID_* */
 #include <sys/vnode.h>
 #include <sys/syscallargs.h>
 #include <sys/core.h>

Index: src/sys/arch/x86/x86/core_machdep.c
diff -u src/sys/arch/x86/x86/core_machdep.c:1.1 src/sys/arch/x86/x86/core_machdep.c:1.2
--- src/sys/arch/x86/x86/core_machdep.c:1.1	Mon Mar 30 22:13:42 2009
+++ src/sys/arch/x86/x86/core_machdep.c	Sat Aug 15 23:45:01 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: core_machdep.c,v 1.1 2009/03/30 22:13:42 rmind Exp $	*/
+/*	$NetBSD: core_machdep.c,v 1.2 2009/08/15 23:45:01 matt Exp $	*/
 
 /*-
  * Copyright (c) 1982, 1986 The Regents of the University of California.
@@ -80,7 +80,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: core_machdep.c,v 1.1 2009/03/30 22:13:42 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: core_machdep.c,v 1.2 2009/08/15 23:45:01 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -92,6 +92,8 @@
 #include <sys/exec.h>
 #include <sys/ptrace.h>
 
+#include <sys/exec_aout.h>
+
 #include <uvm/uvm_extern.h>
 
 #include <machine/cpu.h>

Reply via email to