summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1999-11-01 20:51:12 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1999-11-01 20:51:12 +0000
commit6f71fdc8f39041503e33b51d2f7cdfeecb38c620 (patch)
tree3687bba8eac454a7058d78f517453b44301d3992 /sys
parentfb68b88b5ff9807f9177e2bd2d62f842a57216e9 (diff)
add it back in
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/i386/i386/machdep.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c
index 8545f1ad6b8..f6227e677da 100644
--- a/sys/arch/i386/i386/machdep.c
+++ b/sys/arch/i386/i386/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.118 1999/11/01 20:50:44 deraadt Exp $ */
+/* $OpenBSD: machdep.c,v 1.119 1999/11/01 20:51:11 deraadt Exp $ */
/* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */
/*-
@@ -315,15 +315,16 @@ cpu_startup()
msgbufmapped = 1;
/* Boot arguments are in page 1 */
- if (bootapiver >= 2) {
+ if (bootapiver & BAPIV_VECTOR) {
pa = (vm_offset_t)bootargv;
for (i = 0; i < btoc(bootargc); i++, pa += NBPG)
pmap_enter(pmap_kernel(),
(vm_offset_t)((caddr_t)bootargp + i * NBPG), pa,
VM_PROT_READ|VM_PROT_WRITE, TRUE,
VM_PROT_READ|VM_PROT_WRITE);
+ bios_getopt();
} else
- bootargp = NULL;
+ panic("/boot is too old: upgrade");
printf(version);
startrtclock();