summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2001-12-14 02:11:46 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2001-12-14 02:11:46 +0000
commit6a4f9d97482c1ecf93e213f0b622db2d5b9482ad (patch)
tree173b0635ea1439f0412e6d65a952bcc5bb64e7b7 /sys/arch
parent539ea7dfef5603b0536cf21e49d147cabe4b6e85 (diff)
Even more one-liners to get the kernel to link.
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/mvme88k/dev/clock.c3
-rw-r--r--sys/arch/mvme88k/mvme88k/eh.S3
-rw-r--r--sys/arch/mvme88k/mvme88k/m88100_fp.S4
3 files changed, 6 insertions, 4 deletions
diff --git a/sys/arch/mvme88k/dev/clock.c b/sys/arch/mvme88k/dev/clock.c
index 9dd6150e516..4343faddb37 100644
--- a/sys/arch/mvme88k/dev/clock.c
+++ b/sys/arch/mvme88k/dev/clock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clock.c,v 1.12 2001/12/13 08:55:51 smurph Exp $ */
+/* $OpenBSD: clock.c,v 1.13 2001/12/14 02:11:43 miod Exp $ */
/*
* Copyright (c) 1999 Steve Murphree, Jr.
* Copyright (c) 1995 Theo de Raadt
@@ -97,6 +97,7 @@
#include <machine/bugio.h>
#include <machine/cpu.h>
#include <machine/mmu.h> /* DMA_CACHE_SYNC, etc... */
+#include <machine/cmmu.h>
#include "pcctwo.h"
#if NPCCTWO > 0
#include <mvme88k/dev/pcctwofunc.h>
diff --git a/sys/arch/mvme88k/mvme88k/eh.S b/sys/arch/mvme88k/mvme88k/eh.S
index 1d4a5562465..3025b17dc10 100644
--- a/sys/arch/mvme88k/mvme88k/eh.S
+++ b/sys/arch/mvme88k/mvme88k/eh.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: eh.S,v 1.20 2001/12/14 01:37:56 miod Exp $ */
+/* $OpenBSD: eh.S,v 1.21 2001/12/14 02:11:45 miod Exp $ */
/*
* Mach Operating System
* Copyright (c) 1993-1991 Carnegie Mellon University
@@ -215,6 +215,7 @@
#include "assym.h"
#include <machine/asm.h>
+#include <machine/board.h>
#include <machine/param.h> /* CPU_ and BRD_ defines */
#include <machine/trap.h> /* for T_ defines */
#ifdef MVME188
diff --git a/sys/arch/mvme88k/mvme88k/m88100_fp.S b/sys/arch/mvme88k/mvme88k/m88100_fp.S
index a23f34530e2..d74312113d0 100644
--- a/sys/arch/mvme88k/mvme88k/m88100_fp.S
+++ b/sys/arch/mvme88k/mvme88k/m88100_fp.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: m88100_fp.S,v 1.13 2001/12/13 08:55:52 smurph Exp $ */
+/* $OpenBSD: m88100_fp.S,v 1.14 2001/12/14 02:11:45 miod Exp $ */
/*
* Mach Operating System
* Copyright (c) 1991 Carnegie Mellon University
@@ -166,7 +166,7 @@ fp_p_trap:
st r3,r31,32 /* save exception frame */
or r2,r0,T_FPEPFLT /* load trap type */
or r3, r29, r0
- bsr _C_LABEL(trap18x) /* trap */
+ bsr _C_LABEL(m88100_trap) /* trap */
ld r1,r31,36 /* recover return address */
addu r31,r31,40 /* deallocate stack */
br fp_p_return