More m68k common include files factorization.

12 files changed, 145 insertions, 254 deletions

diff --git a/sys/arch/hp300/include/exec.h b/sys/arch/hp300/include/exec.h
index df79c23895b..efcb5a0d14f 100644
--- a/sys/arch/hp300/include/exec.h
+++ b/sys/arch/hp300/include/exec.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec.h,v 1.8 2001/01/22 14:51:03 art Exp $	*/
+/*	$OpenBSD: exec.h,v 1.9 2003/10/09 21:48:45 miod Exp $	*/
 /*	$NetBSD: exec.h,v 1.10 1995/11/20 01:15:26 thorpej Exp $	*/
 
 /*
@@ -28,37 +28,4 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _MACHINE_EXEC_H_
-#define _MACHINE_EXEC_H_
-
-#define __LDPGSZ	8192
-
-/* Relocation format. */
-struct relocation_info_m68k {
-	int r_address;			/* offset in text or data segment */
-	unsigned int r_symbolnum : 24,	/* ordinal number of add symbol */
-			 r_pcrel :  1,	/* 1 if value should be pc-relative */
-			r_length :  2,	/* log base 2 of value's width */
-			r_extern :  1,	/* 1 if need to add symbol to value */
-		       r_baserel :  1,	/* linkage table relative */
-		      r_jmptable :  1,	/* relocate to jump table */
-		      r_relative :  1,	/* load address relative */
-			  r_copy :  1;	/* run time copy */
-};
-#define relocation_info	relocation_info_m68k
-
-#define ARCH_ELFSIZE		32
-
-#define ELF_TARG_CLASS		ELFCLASS32
-#define ELF_TARG_DATA		ELFDATA2MSB
-#define ELF_TARG_MACH		EM_68K
-
-#define _NLIST_DO_AOUT
-#define _NLIST_DO_ELF
-
-#define _KERN_DO_AOUT
-#if defined(COMPAT_LINUX) || defined(COMPAT_SVR4)
-#define _KERN_DO_ELF
-#endif
-
-#endif  /* _MACHINE_EXEC_H_ */
+#include <m68k/exec.h>
diff --git a/sys/arch/hp300/include/pcb.h b/sys/arch/hp300/include/pcb.h
index 5e1113e0934..6ae98b579bb 100644
--- a/sys/arch/hp300/include/pcb.h
+++ b/sys/arch/hp300/include/pcb.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcb.h,v 1.4 2003/06/02 23:27:45 millert Exp $	*/
+/*	$OpenBSD: pcb.h,v 1.5 2003/10/09 21:48:45 miod Exp $	*/
 /*	$NetBSD: pcb.h,v 1.8 1995/05/12 12:55:17 mycroft Exp $	*/
 
 /*
@@ -39,31 +39,4 @@
  *	@(#)pcb.h	8.1 (Berkeley) 6/10/93
  */
 
-#ifndef _HP300_PCB_H_
-#define _HP300_PCB_H_
-
-#include <machine/frame.h>
-
-/*
- * HP300 process control block
- */
-struct pcb {
-	short	pcb_flags;	/* misc. process flags */
-	short	pcb_ps; 	/* processor status word */
-	int	pcb_ustp;	/* user segment table pointer */
-	int	pcb_usp;	/* user stack pointer */
-	int	pcb_regs[12];	/* D2-D7, A2-A7 */
-	caddr_t	pcb_onfault;	/* for copyin/out faults */
-	struct	fpframe pcb_fpregs; /* 68881/2 context save area */
-};
-
-/*
- * The pcb is augmented with machine-dependent additional data for
- * core dumps. For the hp300, this includes an HP-UX exec header
- * which is dumped for HP-UX processes.
- */
-struct md_coredump {
-	int	md_exec[16];	/* exec structure for HP-UX core dumps */
-};
-
-#endif /* _HP300_PCB_H_ */
+#include <m68k/pcb.h>
diff --git a/sys/arch/hp300/include/proc.h b/sys/arch/hp300/include/proc.h
index 862bd4ae41b..ccdd88ff0ee 100644
--- a/sys/arch/hp300/include/proc.h
+++ b/sys/arch/hp300/include/proc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: proc.h,v 1.5 2003/06/02 23:27:45 millert Exp $	*/
+/*	$OpenBSD: proc.h,v 1.6 2003/10/09 21:48:45 miod Exp $	*/
 /*	$NetBSD: proc.h,v 1.7 1997/03/16 09:41:36 thorpej Exp $	*/
 
 /*
@@ -32,19 +32,4 @@
  *	@(#)proc.h	8.1 (Berkeley) 6/10/93
  */
 
-/*
- * Machine-dependent part of the proc structure for hp300.
- */
-struct mdproc {
-	int	*md_regs;		/* registers on current frame */
-	int	md_flags;		/* machine-dependent flags */
-};
-
-/* md_flags */
-#define MDP_STACKADJ	0x0002	/* frame SP adjusted; undo when syscall does ERE
-START */
-#define	MDP_HPUXMMAP	0x0008	/* VA space is multiply mapped */
-#define MDP_CCBDATA	0x0010	/* copyback caching of data (68040) */
-#define MDP_CCBSTACK	0x0020	/* copyback caching of stack (68040) */
-#define MDP_UNCACHE_WX	0x0040	/* The process might modify code, so
-				   don't cache writeable executable pages. */
+#include <m68k/proc.h>
diff --git a/sys/arch/m68k/include/exec.h b/sys/arch/m68k/include/exec.h
index 522f4c2b595..9838de6d92a 100644
--- a/sys/arch/m68k/include/exec.h
+++ b/sys/arch/m68k/include/exec.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec.h,v 1.2 2001/01/22 14:51:04 art Exp $ */
+/*	$OpenBSD: exec.h,v 1.3 2003/10/09 21:48:47 miod Exp $ */
 /*	$NetBSD: exec.h,v 1.8 1994/11/21 21:33:39 gwr Exp $	*/
 
 /*
@@ -54,7 +54,11 @@ struct relocation_info_m68k {
 #define ELF_TARG_MACH           EM_68K
 
 #define _NLIST_DO_AOUT
+#define _NLIST_DO_ELF
 
 #define _KERN_DO_AOUT
+#if defined(COMPAT_LINUX) || defined(COMPAT_SVR4)
+#define	_KERN_DO_ELF
+#endif
 
 #endif  /* _M68K_EXEC_H_ */
diff --git a/sys/arch/m68k/include/pcb.h b/sys/arch/m68k/include/pcb.h
new file mode 100644
index 00000000000..8174c3175f3
--- /dev/null
+++ b/sys/arch/m68k/include/pcb.h
@@ -0,0 +1,69 @@
+/*	$OpenBSD: pcb.h,v 1.1 2003/10/09 21:48:47 miod Exp $	*/
+/*	$NetBSD: pcb.h,v 1.8 1995/05/12 12:55:17 mycroft Exp $	*/
+
+/*
+ * Copyright (c) 1988 University of Utah.
+ * Copyright (c) 1982, 1986, 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * the Systems Programming Group of the University of Utah Computer
+ * Science Department.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * from: Utah $Hdr: pcb.h 1.14 91/03/25$
+ *
+ *	@(#)pcb.h	8.1 (Berkeley) 6/10/93
+ */
+
+#ifndef _M68K_PCB_H_
+#define _M68K_PCB_H_
+
+#include <machine/frame.h>
+
+/*
+ * m68k process control block
+ */
+struct pcb {
+	short	pcb_flags;	/* misc. process flags */
+	short	pcb_ps; 	/* processor status word */
+	int	pcb_ustp;	/* user segment table pointer */
+	int	pcb_usp;	/* user stack pointer */
+	int	pcb_regs[12];	/* D2-D7, A2-A7 */
+	caddr_t	pcb_onfault;	/* for copyin/out faults */
+	struct	fpframe pcb_fpregs; /* 68881/2 context save area */
+};
+
+/*
+ * The pcb is augmented with machine-dependent additional data for
+ * core dumps. For ports providing COMPAT_HPUX, this includes an HP-UX
+ * exec header which is dumped for HP-UX processes.
+ */
+struct md_coredump {
+	int	md_exec[16];	/* exec structure for HP-UX core dumps */
+};
+
+#endif /* _M68K_PCB_H_ */
diff --git a/sys/arch/m68k/include/proc.h b/sys/arch/m68k/include/proc.h
new file mode 100644
index 00000000000..dc4799d7a16
--- /dev/null
+++ b/sys/arch/m68k/include/proc.h
@@ -0,0 +1,53 @@
+/*	$OpenBSD: proc.h,v 1.1 2003/10/09 21:48:47 miod Exp $ */
+
+/*
+ * Copyright (c) 1991, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)proc.h	8.1 (Berkeley) 6/10/93
+ */
+
+#ifndef _M68K_PROC_H_
+#define _M68K_PROC_H_
+
+/*
+ * Machine-dependent part of the proc structure for m68k.
+ */
+struct mdproc {
+	int	*md_regs;		/* registers on current frame */
+	int	md_flags;		/* machine-dependent flags */
+};
+
+/* md_flags */
+#define MDP_STACKADJ	0x0002	/* frame SP adjusted; undo when syscall does ERESTART */
+#define	MDP_HPUXMMAP	0x0008	/* VA space is multiply mapped */
+#define	MDP_CCBDATA	0x0010	/* copyback caching of data (68040) */
+#define	MDP_CCBSTACK	0x0020	/* copyback caching of stack (68040) */
+#define MDP_UNCACHE_WX	0x0040	/* The process might modify code, so
+				   don't cache writeable executable pages.  */
+
+#endif	/* _M68K_PROC_H_ */
diff --git a/sys/arch/mac68k/include/exec.h b/sys/arch/mac68k/include/exec.h
index 14e95b24252..7e02e75ecf4 100644
--- a/sys/arch/mac68k/include/exec.h
+++ b/sys/arch/mac68k/include/exec.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec.h,v 1.7 2001/01/22 14:51:04 art Exp $	*/
+/*	$OpenBSD: exec.h,v 1.8 2003/10/09 21:48:48 miod Exp $	*/
 /*	$NetBSD: exec.h,v 1.8 1996/05/05 06:17:40 briggs Exp $	*/
 
 /*-
@@ -34,39 +34,5 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
-#ifndef _MAC68K_EXEC_H_
-#define _MAC68K_EXEC_H_
 
-#define __LDPGSZ	8192
-
-/* #define cpu_exec_makecmds(p,epp)	ENOEXEC */
-
-/* Relocation format. */
-struct relocation_info_mac68k {
-	int r_address;			/* offset in text or data segment */
-	unsigned int r_symbolnum : 24,	/* ordinal number of add symbol */
-			 r_pcrel :  1,	/* 1 if value should be pc-relative */
-			r_length :  2,	/* log base 2 of value's width */
-			r_extern :  1,	/* 1 if need to add symbol to value */
-		       r_baserel :  1,	/* linkage table relative */
-		      r_jmptable :  1,	/* relocate to jump table */
-		      r_relative :  1,	/* load address relative */
-			  r_copy :  1;	/* run time copy */
-};
-#define relocation_info	relocation_info_mac68k
-
-#define ARCH_ELFSIZE		32
-
-#define ELF_TARG_CLASS		ELFCLASS32
-#define ELF_TARG_DATA		ELFDATA2MSB
-#define ELF_TARG_MACH		EM_68K
-
-#define _NLIST_DO_AOUT
-#define _NLIST_DO_ELF
-
-#define _KERN_DO_AOUT
-#if defined(COMPAT_LINUX) || defined(COMPAT_SVR4)
-#define _KERN_DO_ELF
-#endif
-
-#endif /* _MAC68K_EXEC_H_ */
+#include <m68k/exec.h>
diff --git a/sys/arch/mac68k/include/pcb.h b/sys/arch/mac68k/include/pcb.h
index c94b5d99c2d..4c1192d3cbe 100644
--- a/sys/arch/mac68k/include/pcb.h
+++ b/sys/arch/mac68k/include/pcb.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcb.h,v 1.6 2003/06/02 23:27:49 millert Exp $	*/
+/*	$OpenBSD: pcb.h,v 1.7 2003/10/09 21:48:48 miod Exp $	*/
 /*	$NetBSD: pcb.h,v 1.7 1996/05/05 06:17:51 briggs Exp $	*/
 
 /*
@@ -72,34 +72,5 @@
  *
  *	@(#)pcb.h	7.4 (Berkeley) 5/4/91
  */
-#ifndef	_MAC68K_PCB_H_
-#define	_MAC68K_PCB_H_
 
-#include <machine/frame.h>
-
-/*
- * mac68k process control block
- */
-struct pcb
-{
-	short	pcb_flags;	/* misc. process flags (+0) */
-	short	pcb_ps; 	/* processor status word (+2) */
-	int	pcb_ustp;	/* user segment table pointer (+4) */
-	int	pcb_usp;	/* user stack pointer (+8) */
-	int	pcb_regs[12];	/* D2-D7, A2-A7 (+C) */
-	caddr_t	pcb_onfault;	/* for copyin/out faults */
-	struct	fpframe pcb_fpregs; /* 68881/2 context save area */
-};
-
-/* flags */
-
-/*
- * The pcb is augmented with machine-dependent additional data for
- * core dumps.  For the m68k, this includes a header that, for the
- * hp300, is used for HP-UX processes' exec header.
- */
-struct md_coredump {
-	int	md_exec[16];	/* Exec structure for HP-UX (sic) core dumps */
-};
-
-#endif /* _MAC68K_PCB_H_ */
+#include <m68k/pcb.h>
diff --git a/sys/arch/mac68k/include/proc.h b/sys/arch/mac68k/include/proc.h
index 2f6296d9591..19d35bfe80e 100644
--- a/sys/arch/mac68k/include/proc.h
+++ b/sys/arch/mac68k/include/proc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: proc.h,v 1.6 2003/06/02 23:27:49 millert Exp $	*/
+/*	$OpenBSD: proc.h,v 1.7 2003/10/09 21:48:48 miod Exp $	*/
 /*	$NetBSD: proc.h,v 1.5 1994/10/26 08:46:40 cgd Exp $	*/
 
 /*
@@ -32,23 +32,4 @@
  *	@(#)proc.h	7.1 (Berkeley) 5/15/91
  */
 
-/*
- * Machine-dependent part of the proc structure for hp300.
- */
-#ifndef _MAC68K_PROC_H_
-#define _MAC68K_PROC_H_
-
-struct mdproc {
-	int	*md_regs;		/* registers on current frame */
-	int	md_flags;		/* machine-dependent flags */
-};
-
-/* md_flags */
-#define	MDP_AST		0x0001	/* async trap pending */
-#define	MDP_STACKADJ	0x0002	/* Frame SP adjusted, might have to
-				   undo when system call returns
-				   ERESTART. */
-#define	MDP_UNCACHE_WX	0x0004	/* The process might modify code, so
-				   don't cache writeable executable pages.  */
-
-#endif	/* _MAC68K_PROC_H_ */
+#include <m68k/proc.h>
diff --git a/sys/arch/mvme68k/include/exec.h b/sys/arch/mvme68k/include/exec.h
index fe72f195227..8d42927bff2 100644
--- a/sys/arch/mvme68k/include/exec.h
+++ b/sys/arch/mvme68k/include/exec.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec.h,v 1.7 2001/01/22 14:51:04 art Exp $ */
+/*	$OpenBSD: exec.h,v 1.8 2003/10/09 21:48:48 miod Exp $ */
 
 /*
  * Copyright (c) 1993 Christopher G. Demetriou
@@ -26,37 +26,5 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef _MVME68K_EXEC_H_
-#define _MVME68K_EXEC_H_
 
-#define __LDPGSZ	8192
-
-/* Relocation format. */
-struct relocation_info_m68k {
-	int r_address;			/* offset in text or data segment */
-	unsigned int r_symbolnum : 24,	/* ordinal number of add symbol */
-			 r_pcrel :  1,	/* 1 if value should be pc-relative */
-			r_length :  2,	/* log base 2 of value's width */
-			r_extern :  1,	/* 1 if need to add symbol to value */
-		       r_baserel :  1,	/* linkage table relative */
-		      r_jmptable :  1,	/* relocate to jump table */
-		      r_relative :  1,	/* load address relative */
-			  r_copy :  1;	/* run time copy */
-};
-#define relocation_info	relocation_info_m68k
-
-#define ARCH_ELFSIZE		32
-
-#define ELF_TARG_CLASS		ELFCLASS32
-#define ELF_TARG_DATA		ELFDATA2MSB
-#define ELF_TARG_MACH		EM_68K
-
-#define _NLIST_DO_AOUT
-#define _NLIST_DO_ELF
-
-#define _KERN_DO_AOUT
-#if defined(COMPAT_LINUX) || defined(COMPAT_SVR4)
-#define _KERN_DO_ELF
-#endif
-
-#endif  /* _MVME68K_EXEC_H_ */
+#include <m68k/exec.h>
diff --git a/sys/arch/mvme68k/include/pcb.h b/sys/arch/mvme68k/include/pcb.h
index d7b66947316..18fb2816c61 100644
--- a/sys/arch/mvme68k/include/pcb.h
+++ b/sys/arch/mvme68k/include/pcb.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcb.h,v 1.5 2003/06/02 23:27:50 millert Exp $ */
+/*	$OpenBSD: pcb.h,v 1.6 2003/10/09 21:48:48 miod Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -38,31 +38,4 @@
  *	@(#)pcb.h	8.1 (Berkeley) 6/10/93
  */
 
-#ifndef _MVME68K_PCB_H_
-#define _MVME68K_PCB_H_
-
-#include <machine/frame.h>
-
-/*
- * mvme68k process control block
- */
-struct pcb {
-	short	pcb_flags;	/* misc. process flags */
-	short	pcb_ps; 	/* processor status word */
-	int	pcb_ustp;	/* user segment table pointer */
-	int	pcb_usp;	/* user stack pointer */
-	int	pcb_regs[12];	/* D2-D7, A2-A7 */
-	caddr_t	pcb_onfault;	/* for copyin/out faults */
-	struct	fpframe pcb_fpregs; /* 68881/2 context save area */
-};
-
-/*
- * The pcb is augmented with machine-dependent additional data for
- * core dumps. For the hp300, this includes an HP-UX exec header
- * which is dumped for HP-UX processes.
- */
-struct md_coredump {
-	int	md_exec[16];	/* exec structure for HP-UX core dumps */
-};
-
-#endif
+#include <m68k/pcb.h>
diff --git a/sys/arch/mvme68k/include/proc.h b/sys/arch/mvme68k/include/proc.h
index 29c59af72dd..614e168d332 100644
--- a/sys/arch/mvme68k/include/proc.h
+++ b/sys/arch/mvme68k/include/proc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: proc.h,v 1.6 2003/06/02 23:27:50 millert Exp $ */
+/*	$OpenBSD: proc.h,v 1.7 2003/10/09 21:48:48 miod Exp $ */
 
 /*
  * Copyright (c) 1991, 1993
@@ -31,23 +31,4 @@
  *	@(#)proc.h	8.1 (Berkeley) 6/10/93
  */
 
-#ifndef _MVME68K_PROC_H_
-#define _MVME68K_PROC_H_
-
-/*
- * Machine-dependent part of the proc structure for mvme68k.
- */
-struct mdproc {
-	int	*md_regs;		/* registers on current frame */
-	int	md_flags;		/* machine-dependent flags */
-};
-
-/* md_flags */
-#define MDP_STACKADJ	0x0002	/* frame SP adjusted; undo when syscall does ERESTART */
-#define	MDP_HPUXMMAP	0x0008	/* VA space is multiply mapped */
-#define	MDP_CCBDATA	0x0010	/* copyback caching of data (68040) */
-#define	MDP_CCBSTACK	0x0020	/* copyback caching of stack (68040) */
-#define MDP_UNCACHE_WX	0x0040	/* The process might modify code, so
-				   don't cache writeable executable pages.  */
-
-#endif
+#include <m68k/proc.h>