summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2001-03-07 23:50:36 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2001-03-07 23:50:36 +0000
commit726e63885a8b5c13f9482cf34122ccc4f946980b (patch)
tree967c705160a4d2f51e5a27fe9917f659e8d29abc /sys
parent384981bf96fb733f99a8350577cfd75862b56aba (diff)
Include <machine/cpu.h> for non-locore code.
This makes sure code including <machine/param.h> will get prototypes for setsoftXXX macros - there is code in the tree which depends on this.
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/mvme88k/include/param.h14
1 files changed, 10 insertions, 4 deletions
diff --git a/sys/arch/mvme88k/include/param.h b/sys/arch/mvme88k/include/param.h
index 3d6013ab19f..d03e3190454 100644
--- a/sys/arch/mvme88k/include/param.h
+++ b/sys/arch/mvme88k/include/param.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: param.h,v 1.13 2001/02/01 03:38:18 smurph Exp $ */
+/* $OpenBSD: param.h,v 1.14 2001/03/07 23:50:35 miod Exp $ */
/*
* Copyright (c) 1999 Steve Murphree, Jr.
* Copyright (c) 1988 University of Utah.
@@ -40,11 +40,18 @@
* from: Utah $Hdr: machparam.h 1.11 89/08/14$
*
* @(#)param.h 7.8 (Berkeley) 6/28/91
- * $Id: param.h,v 1.13 2001/02/01 03:38:18 smurph Exp $
+ * $Id: param.h,v 1.14 2001/03/07 23:50:35 miod Exp $
*/
#ifndef _MACHINE_PARAM_H_
#define _MACHINE_PARAM_H_
+#ifdef _KERNEL
+#ifndef _LOCORE
+#include <machine/cpu.h>
+#include <machine/psl.h>
+#endif /* _LOCORE */
+#endif
+
#define _MACHINE mvme88k
#define MACHINE "mvme88k"
#define _MACHINE_ARCH m88k
@@ -166,9 +173,8 @@
#define mvme88k_btop(x) ((unsigned)(x) >> PGSHIFT)
#define mvme88k_ptob(x) ((unsigned)(x) << PGSHIFT)
-#include <machine/psl.h>
-
#ifdef _KERNEL
+extern int delay __P((int));
#define DELAY(x) delay(x)
#endif