diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2004-02-23 09:13:00 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2004-02-23 09:13:00 +0000 |
| commit | 11fdcc241de6b6057357b9487a87393ee466b34d (patch) | |
| tree | 3c68e17a319c1afc14e9b1e19b0943e6e7e8768f | |
| parent | 275222c05e633e180ac7dc89572ff77c018eb8b6 (diff) | |
the consdev pass from boot and a cnset() in the kernel seems to be a bit premature and cause problems
| -rw-r--r-- | sys/arch/amd64/amd64/locore.S | 8 | ||||
| -rw-r--r-- | sys/arch/amd64/amd64/machdep.c | 12 |
2 files changed, 2 insertions, 18 deletions
diff --git a/sys/arch/amd64/amd64/locore.S b/sys/arch/amd64/amd64/locore.S index b680bd86f36..ed2ad4bf6cd 100644 --- a/sys/arch/amd64/amd64/locore.S +++ b/sys/arch/amd64/amd64/locore.S @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.S,v 1.7 2004/02/23 08:32:36 mickey Exp $ */ +/* $OpenBSD: locore.S,v 1.8 2004/02/23 09:12:59 mickey Exp $ */ /* $NetBSD: locore.S,v 1.2 2003/04/26 19:34:45 fvdl Exp $ */ /* @@ -193,7 +193,6 @@ _C_LABEL(lapic_isr): .globl _C_LABEL(proc0paddr),_C_LABEL(PTDpaddr) .globl _C_LABEL(biosbasemem),_C_LABEL(biosextmem) .globl _C_LABEL(bootapiver), _C_LABEL(bootargc), _C_LABEL(bootargv) - .globl _C_LABEL(boot_consdev) .globl _C_LABEL(gdtstore) _C_LABEL(cpu): .long 0 # are we 386, 386sx, or 486, # or Pentium, or.. @@ -210,7 +209,6 @@ _C_LABEL(atdevbase): .quad 0 # location of start of iomem in virtual _C_LABEL(bootapiver): .long 0 # /boot API version _C_LABEL(bootargc): .long 0 # /boot argc _C_LABEL(bootargv): .quad 0 # /boot argv -_C_LABEL(boot_consdev): .long 0 # console device (temporary) _C_LABEL(proc0paddr): .quad 0 _C_LABEL(PTDpaddr): .quad 0 # paddr of PTD, for libkvm #ifndef REALBASEMEM @@ -269,7 +267,6 @@ start: movw $0x1234,0x472 # warm boot * Load parameters from stack * (howto, bootdev, bootapiver, esym, extmem, cnvmem, ac, av) * - * XXX boot_consdev temporarily tacked on to the end */ movl 4(%esp),%eax movl %eax, RELOC(boothowto) @@ -299,9 +296,6 @@ start: movw $0x1234,0x472 # warm boot xorl %eax, %eax movl %eax, 4(%ebx) - movl 36(%esp), %eax - movl %eax, RELOC(boot_consdev) - /* First, reset the PSL. */ pushl $PSL_MBO popfl diff --git a/sys/arch/amd64/amd64/machdep.c b/sys/arch/amd64/amd64/machdep.c index 32f50d58787..ff99498d051 100644 --- a/sys/arch/amd64/amd64/machdep.c +++ b/sys/arch/amd64/amd64/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.8 2004/02/23 01:19:52 tom Exp $ */ +/* $OpenBSD: machdep.c,v 1.9 2004/02/23 09:12:59 mickey Exp $ */ /* $NetBSD: machdep.c,v 1.3 2003/05/07 22:58:18 fvdl Exp $ */ /*- @@ -1214,16 +1214,6 @@ init_x86_64(first_avail) uvmexp.ncolors = 2; #endif - /* - * XXX /boot temporarily passes an extra parameter for the - * console device. - */ - { - extern dev_t boot_consdev; - - cnset(boot_consdev); - } - avail_start = PAGE_SIZE; /* BIOS leaves data in low memory */ /* and VM system doesn't work with phys 0 */ #ifdef MULTIPROCESSOR |