Move common prototypes to <m68k/{cpu,param}.h> instead of incomplete

declarations in <machine/{cpu,param}.h> and elsewhere.

12 files changed, 106 insertions, 183 deletions

diff --git a/sys/arch/hp300/include/cpu.h b/sys/arch/hp300/include/cpu.h
index b0b4c88636b..9f08406f383 100644
--- a/sys/arch/hp300/include/cpu.h
+++ b/sys/arch/hp300/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.29 2006/01/02 18:09:23 miod Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.30 2006/06/11 20:48:11 miod Exp $	*/
 /*	$NetBSD: cpu.h,v 1.28 1998/02/13 07:41:51 scottr Exp $	*/
 
 /*
@@ -91,7 +91,7 @@ struct clockframe {
  * or after the current trap/syscall if in system mode.
  */
 extern int want_resched;	/* resched() was called */
-#define	need_resched(ci)	{ want_resched++; aston(); }
+#define	need_resched(ci)	{ want_resched = 1; aston(); }
 
 /*
  * Give a profiling tick to the current process when the user profiling
@@ -107,7 +107,7 @@ extern int want_resched;	/* resched() was called */
 #define	signotify(p)	aston()
 
 extern int astpending;		/* need to trap before returning to user mode */
-#define aston() (astpending++)
+#define aston() (astpending = 1)
 
 /*
  * CTL_MACHDEP definitions.
@@ -140,33 +140,7 @@ struct fpframe;
 struct pcb;
 
 /* locore.s functions */
-void	m68881_save(struct fpframe *);
-void	m68881_restore(struct fpframe *);
-void	DCIA(void);
-void	DCIS(void);
-void	DCIU(void);
-void	ICIA(void);
-void	ICPA(void);
 void	PCIA(void);
-void	TBIA(void);
-void	TBIS(vaddr_t);
-void	TBIAS(void);
-void	TBIAU(void);
-#if defined(M68040)
-void	DCFA(void);
-void	DCFP(paddr_t);
-void	DCFL(paddr_t);
-void	DCPL(paddr_t);
-void	DCPP(paddr_t);
-void	ICPL(paddr_t);
-void	ICPP(paddr_t);
-#endif
-int	suline(caddr_t, caddr_t);
-void	savectx(struct pcb *);
-void	switch_exit(struct proc *);
-void	proc_trampoline(void);
-void	loadustp(int);
-
 __dead void	doboot(void);
 void	ecacheon(void);
 void	ecacheoff(void);
diff --git a/sys/arch/hp300/include/param.h b/sys/arch/hp300/include/param.h
index 502bd44ea0f..861bf1dd1e8 100644
--- a/sys/arch/hp300/include/param.h
+++ b/sys/arch/hp300/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.24 2005/09/12 23:05:05 miod Exp $	*/
+/*	$OpenBSD: param.h,v 1.25 2006/06/11 20:48:11 miod Exp $	*/
 /*	$NetBSD: param.h,v 1.35 1997/07/10 08:22:38 veego Exp $	*/
 
 /*
@@ -48,23 +48,12 @@
 #define	_MACHINE	hp300
 #define	MACHINE		"hp300"
 
-/*
- * Interrupt glue.
- */
-#include <machine/intr.h>
-
-#define	PGSHIFT		12		/* LOG2(NBPG) */
-
 #define	PAGE_SHIFT	12
-#define	PAGE_SIZE	(1 << PAGE_SHIFT)
-#define	PAGE_MASK	(PAGE_SIZE - 1)
 
 #define	KERNBASE	0x00000000	/* start of kernel virtual */
 
 #include <m68k/param.h>
 
-#define	NPTEPG		(NBPG/(sizeof (pt_entry_t)))
-
 #define MSGBUFSIZE 4096
 
 #if defined(_KERNEL) && !defined(_LOCORE)
diff --git a/sys/arch/m68k/include/cpu.h b/sys/arch/m68k/include/cpu.h
index 232dd54eb5b..08494397e2f 100644
--- a/sys/arch/m68k/include/cpu.h
+++ b/sys/arch/m68k/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.12 2005/08/01 11:54:23 miod Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.13 2006/06/11 20:48:13 miod Exp $	*/
 /*	$NetBSD: cpu.h,v 1.3 1997/02/02 06:56:57 thorpej Exp $	*/
 
 /*
@@ -54,21 +54,16 @@
  * Individual ports are expected to define the following CPP symbols
  * in <machine/cpu.h> to enable conditional code:
  *
- *	M68K_MMU_MOTOROLA	Machine has a Motorola MMU (incl.
+ *	M68K_MMU_MOTOROLA	Machine may have a Motorola MMU (incl.
  *				68851, 68030, 68040, 68060)
  *
- *	M68K_MMU_HP		Machine has an HP MMU.
+ *	M68K_MMU_HP		Machine may have an HP MMU.
  *
  * Note also that while m68k-generic code conditionalizes on the
  * M68K_MMU_HP CPP symbol, none of the HP MMU definitions are in this
  * file (since none are used in otherwise sharable code).
  */
 
-/*
- * XXX Much more could be pulled out of port-specific header files
- * XXX and placed here.
- */
-
 #ifdef _KERNEL
 /*
  * All m68k ports must provide these globals.
@@ -184,7 +179,24 @@ extern	int mmutype;		/* MMU on this host */
 #define	CACHE60_ON	(CACHE40_ON|IC60_CABC|IC60_EBC|DC60_ESB)
 #define	CACHE60_OFF	(CACHE40_OFF|IC60_CABC)
 
+/* bits in the 68060 Processor Control Register */
+#define	PCR_IDSHIFT	16
+#define	PCR_IDMASK	0xffff
+#define	PCR_68060		0x430
+#define	PCR_68060LC		0x431
+#define	PCR_REVSHIFT	8
+#define	PCR_REVMASK	0xff
+#define	PCR_DEBUG	0x80
+#define	PCR_FPUDIS	0x02
+#define	PCR_SUPERSCALAR	0x01
+
 #ifdef _KERNEL
+struct frame;
+struct fpframe;
+struct pcb;
+struct proc;
+struct trapframe;
+
 void	copypage(void *fromaddr, void *toaddr);
 void	zeropage(void *addr);
 #ifdef MAPPEDCOPY
@@ -194,16 +206,38 @@ extern	u_int mappedcopysize;
 #endif /* MAPPEDCOPY */
 
 /* locore.s */
-u_long getdfc(void);
-u_long getsfc(void);
+void	TBIS(vaddr_t);
+void	TBIAS(void);
+void	TBIAU(void);
+void	ICIA(void);
+void	DCIA(void);
+void	DCIS(void);
+void	DCIU(void);
+#if defined(M68040) || defined(M68060)
+void	ICPA(void);
+void	DCFA(void);
+void	ICPL(paddr_t);
+void	ICPP(paddr_t);
+void	DCPL(paddr_t);
+void	DCPP(paddr_t);
+void	DCFL(paddr_t);
+void	DCFP(paddr_t);
+#endif
+
+u_long	getdfc(void);
+u_long	getsfc(void);
+void	loadustp(int);
+void	m68881_restore(struct fpframe *);
+void	m68881_save(struct fpframe *);
+void	proc_trampoline(void);
+void	savectx(struct pcb *);
+int	suline(caddr_t, caddr_t);
+void	switch_exit(struct proc *);
 
 /* m68k_machdep.c */
-struct proc;
-struct frame;
 void userret(struct proc *, struct frame *, u_quad_t, u_int, int);
 
 /* regdump.c */
-struct trapframe;
 void regdump(struct trapframe *, int);
 
 /* sys_machdep.c */
diff --git a/sys/arch/m68k/include/param.h b/sys/arch/m68k/include/param.h
index a6a53080625..31a9b77a19d 100644
--- a/sys/arch/m68k/include/param.h
+++ b/sys/arch/m68k/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.18 2006/03/19 01:47:24 martin Exp $	*/
+/*	$OpenBSD: param.h,v 1.19 2006/06/11 20:48:13 miod Exp $	*/
 /*	$NetBSD: param.h,v 1.2 1997/06/10 18:21:23 veego Exp $	*/
 
 /*
@@ -61,22 +61,35 @@
  */
 #define ALIGNBYTES		(sizeof(int) - 1)
 #define	ALIGN(p)		(((u_int)(p) + ALIGNBYTES) &~ ALIGNBYTES)
-#define ALIGNED_POINTER(p,t)	((((u_long)(p)) & (sizeof(t)-1)) == 0)
+#define ALIGNED_POINTER(p,t)	((((u_long)(p)) & (sizeof(t) - 1)) == 0)
 
+#define	PAGE_SIZE	(1 << PAGE_SHIFT)
+#define	PAGE_MASK	(PAGE_SIZE - 1)
+
+#define	PGSHIFT		PAGE_SHIFT
 #define	NBPG		(1 << PGSHIFT)	/* bytes/page */
 #define	PGOFSET		(NBPG-1)	/* byte offset into page */
-#define	NPTEPG		(NBPG/(sizeof (pt_entry_t)))
+
+#define	NPTEPG		(PAGE_SIZE / (sizeof(pt_entry_t)))
+
+#define	BTOPKERNBASE	((u_long)KERNBASE >> PAGE_SHIFT)
 
 #define	DEV_BSHIFT	9		/* log2(DEV_BSIZE) */
 #define	DEV_BSIZE	(1 << DEV_BSHIFT)
 #define BLKDEV_IOSIZE	2048
 #define	MAXPHYS		(64 * 1024)	/* max raw I/O transfer size */
 
+#define	SEGSHIFT020	(34 - PAGE_SHIFT)
+#define	SEGSHIFT040	(18)
 #ifndef	SEGSHIFT
 #if defined(M68040) || defined(M68060)
-#define	SEGSHIFT	((mmutype <= MMU_68040) ? 18 : (34 - PGSHIFT))
+#if defined(M68020) || defined(M68030)
+#define	SEGSHIFT	((mmutype <= MMU_68040) ? SEGSHIFT040 : SEGSHIFT020)
 #else
-#define	SEGSHIFT	(34 - PGSHIFT)
+#define	SEGSHIFT	SEGSHIFT040
+#endif
+#else
+#define	SEGSHIFT	SEGSHOFT020
 #endif
 #define	NBSEG		(1 << SEGSHIFT)
 #define	SEGOFSET	(NBSEG - 1)
@@ -86,7 +99,7 @@
 #ifndef	UPAGES
 #define UPAGES		2		/* pages of u-area */
 #endif
-#define	USPACE		(UPAGES * NBPG)
+#define	USPACE		(UPAGES * PAGE_SIZE)
 #define	USPACE_ALIGN	(0)		/* u-area alignment 0-none */
 
 /*
@@ -114,12 +127,12 @@
 #define	NMBCLUSTERS	1024		/* map size, max cluster allocation */
 
 /* pages ("clicks") to disk blocks */
-#define	ctod(x)		((x) << (PGSHIFT - DEV_BSHIFT))
-#define	dtoc(x)		((x) >> (PGSHIFT - DEV_BSHIFT))
+#define	ctod(x)		((x) << (PAGE_SHIFT - DEV_BSHIFT))
+#define	dtoc(x)		((x) >> (PAGE_SHIFT - DEV_BSHIFT))
 
 /* pages to bytes */
-#define	ctob(x)		((x) << PGSHIFT)
-#define	btoc(x)		(((x) + PGOFSET) >> PGSHIFT)
+#define	ctob(x)		((x) << PAGE_SHIFT)
+#define	btoc(x)		(((x) + PAGE_MASK) >> PAGE_SHIFT)
 
 /* bytes to disk blocks */
 #define	btodb(x)	((x) >> DEV_BSHIFT)
@@ -146,4 +159,6 @@
 	((unsigned)(v) & ~HPMMMASK)
 #endif	/* COMPAT_HPUX */
 
+#include <machine/intr.h>	/* splXXX() */
+
 #endif	/* !_M68K_PARAM_H_ */
diff --git a/sys/arch/m68k/m68k/regdump.c b/sys/arch/m68k/m68k/regdump.c
index 880c8f7bcab..c0cb560299b 100644
--- a/sys/arch/m68k/m68k/regdump.c
+++ b/sys/arch/m68k/m68k/regdump.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: regdump.c,v 1.5 2003/06/02 23:27:48 millert Exp $	*/
+/*	$OpenBSD: regdump.c,v 1.6 2006/06/11 20:48:13 miod Exp $	*/
 /*	$NetBSD: regdump.c,v 1.1 1997/04/09 19:21:47 thorpej Exp $	*/
 
 /*
@@ -47,9 +47,6 @@
 #include <machine/reg.h>
 #include <machine/psl.h>
 
-/* XXX until m68k/cpu.h has it */
-void regdump(struct trapframe *, int);
-
 void dumpmem(int *, int, int);
 char *hexstr(int, int);
 
diff --git a/sys/arch/m68k/m68k/sig_machdep.c b/sys/arch/m68k/m68k/sig_machdep.c
index a416e658a75..c4b7864c491 100644
--- a/sys/arch/m68k/m68k/sig_machdep.c
+++ b/sys/arch/m68k/m68k/sig_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sig_machdep.c,v 1.17 2006/06/07 21:53:43 miod Exp $	*/
+/*	$OpenBSD: sig_machdep.c,v 1.18 2006/06/11 20:48:13 miod Exp $	*/
 /*	$NetBSD: sig_machdep.c,v 1.3 1997/04/30 23:28:03 gwr Exp $	*/
 
 /*
@@ -81,10 +81,7 @@
 #include <machine/cpu.h>
 #include <machine/reg.h>
 
-extern int fputype;
 extern short exframesize[];
-void	m68881_save(struct fpframe *);
-void	m68881_restore(struct fpframe *);
 
 #define SS_RTEFRAME	1
 #define SS_FPSTATE	2
diff --git a/sys/arch/mac68k/include/cpu.h b/sys/arch/mac68k/include/cpu.h
index 7c65b0a07a2..25445986629 100644
--- a/sys/arch/mac68k/include/cpu.h
+++ b/sys/arch/mac68k/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.37 2006/01/24 06:50:11 miod Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.38 2006/06/11 20:48:13 miod Exp $	*/
 /*	$NetBSD: cpu.h,v 1.45 1997/02/10 22:13:40 scottr Exp $	*/
 
 /*
@@ -104,7 +104,7 @@ struct clockframe {
  * or after the current trap/syscall if in system mode.
  */
 extern int want_resched;	/* resched() was called */
-#define	need_resched(ci)	{ want_resched++; aston(); }
+#define	need_resched(ci)	{ want_resched = 1; aston(); }
 
 /*
  * Give a profiling tick to the current process from the softclock
@@ -120,7 +120,7 @@ extern int want_resched;	/* resched() was called */
 #define	signotify(p)	aston()
 
 extern int astpending;		/* need to trap before returning to user mode */
-#define aston() (astpending++)
+#define aston() (astpending = 1)
 
 #define CPU_CONSDEV	1
 #define CPU_MAXID	2
@@ -253,7 +253,7 @@ struct cpu_model_info {
 	const char	*model;		/* Model description */
 	int		class;		/* Rough class of machine. */
 };
-extern struct cpu_model_info *current_mac_model;
+extern const struct cpu_model_info *current_mac_model;
 
 extern unsigned long		IOBase;		/* Base address of I/O */
 extern unsigned long		NuBusBase;	/* Base address of NuBus */
@@ -280,42 +280,14 @@ extern	unsigned long		load_addr;
 
 #ifdef _KERNEL
 
-struct frame;
-struct fpframe;
-struct pcb;
+/* locore.s */
+void	PCIA(void);
 
 /* machdep.c */
 void	mac68k_set_bell_callback(int (*)(void *, int, int, int), void *);
 int	mac68k_ring_bell(int, int, int);
 u_int	get_mapping(void);
 
-/* locore.s */
-void	m68881_restore(struct fpframe *);
-void	m68881_save(struct fpframe *);
-void	DCIA(void);
-void	DCIS(void);
-void	DCIU(void);
-void	ICIA(void);
-void	ICPA(void);
-void	PCIA(void);
-void	TBIA(void);
-void	TBIAS(void);
-void	TBIAU(void);
-void	TBIS(vaddr_t);
-#if defined(M68040)
-void	DCFA(void);
-void	DCFP(paddr_t);
-void	DCFL(paddr_t);
-void	DCPL(paddr_t);
-void	DCPP(paddr_t);
-void	ICPL(paddr_t);
-void	ICPP(paddr_t);
-#endif
-int	suline(caddr_t, caddr_t);
-void	savectx(struct pcb *);
-void	proc_trampoline(void);
-void	loadustp(int);
-
 /* vm_machdep.c */
 void	physaccess(caddr_t, caddr_t, register int, register int);
 void	physunaccess(caddr_t, register int);
diff --git a/sys/arch/mac68k/include/param.h b/sys/arch/mac68k/include/param.h
index 0f9ecba6180..c9e1348bc79 100644
--- a/sys/arch/mac68k/include/param.h
+++ b/sys/arch/mac68k/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.20 2005/09/12 23:05:05 miod Exp $	*/
+/*	$OpenBSD: param.h,v 1.21 2006/06/11 20:48:13 miod Exp $	*/
 /*	$NetBSD: param.h,v 1.28 1997/03/01 06:57:45 scottr Exp $	*/
 
 /*
@@ -76,21 +76,13 @@
 #ifndef _MAC68K_PARAM_H_
 #define _MAC68K_PARAM_H_
 
-/* Pull in interrupt glue */
-#include <machine/psl.h>
-#include <machine/intr.h>
-
 /*
  * Machine dependent constants for Macintosh II-and-similar series.
  */
 #define	_MACHINE	mac68k
 #define	MACHINE		"mac68k"
 
-#define	PGSHIFT		12		/* LOG2(NBPG) */
-
 #define	PAGE_SHIFT	12
-#define	PAGE_SIZE	(1 << PAGE_SHIFT)
-#define	PAGE_MASK	(PAGE_SIZE - 1)
 
 #define	KERNBASE	0x00000000	/* start of kernel virtual */
 
@@ -98,8 +90,6 @@
 
 #include <m68k/param.h>
 
-#define	NPTEPG		(NBPG/(sizeof (pt_entry_t)))
-
 #define MSGBUFSIZE	4096
 
 #if defined(_KERNEL) && !defined(_LOCORE)
diff --git a/sys/arch/mac68k/mac68k/machdep.c b/sys/arch/mac68k/mac68k/machdep.c
index 7a0e812c0a6..5aaf9701196 100644
--- a/sys/arch/mac68k/mac68k/machdep.c
+++ b/sys/arch/mac68k/mac68k/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.131 2006/05/19 22:51:09 miod Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.132 2006/06/11 20:48:13 miod Exp $	*/
 /*	$NetBSD: machdep.c,v 1.207 1998/07/08 04:39:34 thorpej Exp $	*/
 
 /*
@@ -1519,7 +1519,7 @@ get_machine_info()
 	mac68k_machine.cpu_model_index = i;
 }
 
-struct cpu_model_info *current_mac_model;
+const struct cpu_model_info *current_mac_model;
 
 /*
  * Sets a bunch of machine-specific variables
diff --git a/sys/arch/mac68k/mac68k/vm_machdep.c b/sys/arch/mac68k/mac68k/vm_machdep.c
index b280f493a28..37c98ec68a4 100644
--- a/sys/arch/mac68k/mac68k/vm_machdep.c
+++ b/sys/arch/mac68k/mac68k/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm_machdep.c,v 1.34 2005/09/25 22:26:16 miod Exp $	*/
+/*	$OpenBSD: vm_machdep.c,v 1.35 2006/06/11 20:48:13 miod Exp $	*/
 /*	$NetBSD: vm_machdep.c,v 1.29 1998/07/28 18:34:55 thorpej Exp $	*/
 
 /*
@@ -116,8 +116,6 @@ cpu_fork(p1, p2, stack, stacksize, func, arg)
 	pcb->pcb_regs[11] = (int)sf;		/* SSP */
 }
 
-void	switch_exit(struct proc *);
-
 /*
  * cpu_exit is called as the last action during exit.
  * We release the address space and machine-dependent resources,
diff --git a/sys/arch/mvme68k/include/cpu.h b/sys/arch/mvme68k/include/cpu.h
index 3622cf2563b..c7536919082 100644
--- a/sys/arch/mvme68k/include/cpu.h
+++ b/sys/arch/mvme68k/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.22 2005/11/24 22:43:19 miod Exp $ */
+/*	$OpenBSD: cpu.h,v 1.23 2006/06/11 20:48:13 miod Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -69,17 +69,6 @@
  */
 
 /*
- * CTL_MACHDEP definitions.
- */
-#define	CPU_CONSDEV		1	/* dev_t: console terminal device */
-#define	CPU_MAXID		2	/* number of valid machdep ids */
-
-#define CTL_MACHDEP_NAMES { \
-	{ 0, 0 }, \
-	{ "console_device", CTLTYPE_STRUCT }, \
-}
-
-/*
  * Get common m68k CPU definiti÷ns.
  */
 #define M68K_MMU_MOTOROLA
@@ -91,7 +80,6 @@
  * Get interrupt glue.
  */
 #include <machine/intr.h>
-#include <sys/evcount.h>
 
 /*
  * definitions of cpu-dependent requirements
@@ -146,6 +134,17 @@ extern int want_resched;
 extern int astpending;
 #define aston() (astpending = 1)
 
+/*
+ * CTL_MACHDEP definitions.
+ */
+#define	CPU_CONSDEV		1	/* dev_t: console terminal device */
+#define	CPU_MAXID		2	/* number of valid machdep ids */
+
+#define CTL_MACHDEP_NAMES { \
+	{ 0, 0 }, \
+	{ "console_device", CTLTYPE_STRUCT }, \
+}
+
 extern	vaddr_t intiobase, intiolimit;
 extern	vaddr_t iiomapbase;
 extern	int iiomapsize;
@@ -182,6 +181,8 @@ extern int	cputyp;
 #define CPU_172			0x172
 #define CPU_177			0x177
 
+#include <sys/evcount.h>
+
 struct intrhand {
 	SLIST_ENTRY(intrhand) ih_link;
 	int	(*ih_fn)(void *);
@@ -195,37 +196,8 @@ int intr_establish(int, struct intrhand *, const char *);
 
 #define	NVMEINTR	256
 
-struct frame;
-struct fpframe;
-struct pcb;
-
-void	m68881_save(struct fpframe *);
-void	m68881_restore(struct fpframe *);
-void	DCIA(void);
-void	DCIS(void);
-void	DCIU(void);
-void	ICIA(void);
-void	ICPA(void);
-void	PCIA(void);
-void	TBIA(void);
-void	TBIS(vaddr_t);
-void	TBIAS(void);
-void	TBIAU(void);
-#if defined(M68040) || defined(M68060)
-void	DCFA(void);
-void	DCFP(paddr_t);
-void	DCFL(paddr_t);
-void	DCPL(paddr_t);
-void	DCPP(paddr_t);
-void	ICPL(paddr_t);
-void	ICPP(paddr_t);
-#endif
-int	suline(caddr_t, caddr_t);
-void	savectx(struct pcb *);
-void	switch_exit(struct proc *);
+/* locore.s */
 __dead void	doboot(void);
-void	loadustp(int);
-void	proc_trampoline(void);
 
 int badpaddr(paddr_t, int);
 int badvaddr(vaddr_t, int);
diff --git a/sys/arch/mvme68k/include/param.h b/sys/arch/mvme68k/include/param.h
index c7a54728588..cf5cfe38864 100644
--- a/sys/arch/mvme68k/include/param.h
+++ b/sys/arch/mvme68k/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.20 2005/09/12 23:05:05 miod Exp $ */
+/*	$OpenBSD: param.h,v 1.21 2006/06/11 20:48:13 miod Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -47,11 +47,7 @@
 #define	_MACHINE 	"mvme68k"
 #define	MACHINE 	"mvme68k"
 
-#define	PGSHIFT		12		/* LOG2(NBPG) */
-
 #define	PAGE_SHIFT	12
-#define	PAGE_SIZE	(1 << PAGE_SHIFT)
-#define	PAGE_MASK	(PAGE_SIZE - 1)
 
 #define	KERNBASE	0x00000000	/* start of kernel virtual */
 #define	KERNTEXTOFF	0x00010000	/* start of kernel text */
@@ -60,20 +56,9 @@
 
 #include <m68k/param.h>
 
-/*
- * spl functions; all but spl0 are done in-line
- */
-#include <machine/psl.h>
-
-/*
- * interrupt glue 
- */
-#include <machine/intr.h>
-
-
-#ifdef _KERNEL
+#if defined(_KERNEL) && !defined(_LOCORE)
 extern void delay(int);
 #define DELAY(n)	delay(n)
-#endif
+#endif	/* _KERNEL && !_LOCORE */
 
 #endif	/* _MACHINE_PARAM_H_ */