summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Shalayeff <mickey@cvs.openbsd.org>1997-11-06 02:17:31 +0000
committerMichael Shalayeff <mickey@cvs.openbsd.org>1997-11-06 02:17:31 +0000
commite727efe547804a25c58c9fed7ea309d3da93d26c (patch)
tree19533c3297de5400bae0f0bfd33873ad077f4ada
parent8599f9e108b853b72544216cf749e7fd896e9fa5 (diff)
mak kernel compiles w/o bios0
-rw-r--r--sys/arch/i386/conf/files.i3864
-rw-r--r--sys/kern/init_main.c5
2 files changed, 6 insertions, 3 deletions
diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386
index aad9fa9016a..9902177476c 100644
--- a/sys/arch/i386/conf/files.i386
+++ b/sys/arch/i386/conf/files.i386
@@ -1,4 +1,4 @@
-# $OpenBSD: files.i386,v 1.36 1997/10/27 14:42:01 niklas Exp $
+# $OpenBSD: files.i386,v 1.37 1997/11/06 02:17:30 mickey Exp $
# $NetBSD: files.i386,v 1.73 1996/05/07 00:58:36 thorpej Exp $
#
# new style config file for i386 architecture
@@ -32,7 +32,7 @@ file arch/i386/i386/random.s
file arch/i386/i386/sys_machdep.c
file arch/i386/i386/trap.c
file arch/i386/i386/vm_machdep.c
-file arch/i386/i386/dkcsum.c
+file arch/i386/i386/dkcsum.c bios
file lib/libz/adler32.c !ppp_deflate
file dev/cons.c
file dev/cninit.c
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index 02049b7dc4c..15a52237c1c 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: init_main.c,v 1.27 1997/10/28 10:52:17 niklas Exp $ */
+/* $OpenBSD: init_main.c,v 1.28 1997/11/06 02:17:29 mickey Exp $ */
/* $NetBSD: init_main.c,v 1.84.4.1 1996/06/02 09:08:06 mrg Exp $ */
/*
@@ -335,12 +335,15 @@ main(framep)
schedcpu(NULL);
#ifdef i386
+#include "bios.h"
+#if NBIOS
/* XXX This is only a transient solution */
{
extern dkcsumattach __P((void));
dkcsumattach();
}
#endif
+#endif
/* Mount the root file system. */
if ((*mountroot)())