diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1999-11-01 20:50:45 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1999-11-01 20:50:45 +0000 |
| commit | fb68b88b5ff9807f9177e2bd2d62f842a57216e9 (patch) | |
| tree | 211d603373884b12f91a167e34fb17a841074b26 | |
| parent | 6474f94269fbf3b319de5b9b6bfd8c330ea8dcd9 (diff) | |
remove mickey code to avoid branching
| -rw-r--r-- | sys/arch/i386/i386/machdep.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c index 2938460ab21..8545f1ad6b8 100644 --- a/sys/arch/i386/i386/machdep.c +++ b/sys/arch/i386/i386/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.117 1999/11/01 17:15:08 art Exp $ */ +/* $OpenBSD: machdep.c,v 1.118 1999/11/01 20:50:44 deraadt Exp $ */ /* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */ /*- @@ -315,16 +315,15 @@ cpu_startup() msgbufmapped = 1; /* Boot arguments are in page 1 */ - if (bootapiver & BAPIV_VECTOR) { + if (bootapiver >= 2) { 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 - panic("/boot is too old: upgrade"); + bootargp = NULL; printf(version); startrtclock(); |