diff options
| author | Tobias Weingartner <weingart@cvs.openbsd.org> | 1998-02-26 20:53:25 +0000 |
|---|---|---|
| committer | Tobias Weingartner <weingart@cvs.openbsd.org> | 1998-02-26 20:53:25 +0000 |
| commit | df74e0b21263837c8712f32e2cd1666e4806fce9 (patch) | |
| tree | d580c1e41b4379f70ebed9b07431fc92d80fa884 /sys/arch/i386 | |
| parent | 093bccfcf1e979fa69cc48e181c8c270331b2b63 (diff) | |
Fix boot flags not working. The latest gas patches, which caught some
problems in our locore (which were then fixed), caused this latest bug
to appear. Basically the clearing of the BSS was being done after the
boothowto integer was already filled in.
The new bootblocks already clear the BSS, so the clearing of the BSS
could well be removed from locore. However, for backwards compatibility
we might still need it in there for a while. (I believe the 2.1 boot-
blocks did not clear the BSS).
Diffstat (limited to 'sys/arch/i386')
| -rw-r--r-- | sys/arch/i386/i386/locore.s | 3 | ||||
| -rw-r--r-- | sys/arch/i386/i386/machdep.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sys/arch/i386/i386/locore.s b/sys/arch/i386/i386/locore.s index ebbba2d43e3..2bf7c543eb7 100644 --- a/sys/arch/i386/i386/locore.s +++ b/sys/arch/i386/i386/locore.s @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.s,v 1.41 1998/02/22 00:34:52 niklas Exp $ */ +/* $OpenBSD: locore.s,v 1.42 1998/02/26 20:53:23 weingart Exp $ */ /* $NetBSD: locore.s,v 1.145 1996/05/03 19:41:19 christos Exp $ */ /*- @@ -154,6 +154,7 @@ _cold: .long 1 # cold till we are not _esym: .long 0 # ptr to end of syms _cnvmem: .long 0 # conventional memory size _extmem: .long 0 # extended memory size +_boothowto: .long 0 # boot flags _atdevbase: .long 0 # location of start of iomem in virtual _bootapiver: .long 0 # /boot API version _bootargc: .long 0 # /boot argc diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c index e48879205e0..ed81af25398 100644 --- a/sys/arch/i386/i386/machdep.c +++ b/sys/arch/i386/i386/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.81 1998/02/22 21:35:27 niklas Exp $ */ +/* $OpenBSD: machdep.c,v 1.82 1998/02/26 20:53:24 weingart Exp $ */ /* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */ /*- @@ -183,10 +183,10 @@ int bufpages = BUFPAGES; int bufpages = 0; #endif +extern int boothowto; int physmem; int dumpmem_low; int dumpmem_high; -int boothowto; int cpu_class; struct msgbuf *msgbufp; |