diff options
| author | YASUOKA Masahiko <yasuoka@cvs.openbsd.org> | 2015-09-02 04:09:25 +0000 |
|---|---|---|
| committer | YASUOKA Masahiko <yasuoka@cvs.openbsd.org> | 2015-09-02 04:09:25 +0000 |
| commit | 25c065e3fb0f3cf72fd4ccd77fbb5f3b9bf41e5d (patch) | |
| tree | 9300d5f16470a49c31de5f3c54ae45f6c4b97b38 /sys/arch/i386/stand/libsa/memprobe.c | |
| parent | 493c06b693cc5008b2512212aa374ee840d0a565 (diff) | |
Bring the boot changes on amd64 to i386. alloca is deleted.
Also fix the boot from BIOS and bump the version.
input and ok deraadt
Diffstat (limited to 'sys/arch/i386/stand/libsa/memprobe.c')
| -rw-r--r-- | sys/arch/i386/stand/libsa/memprobe.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/arch/i386/stand/libsa/memprobe.c b/sys/arch/i386/stand/libsa/memprobe.c index aab27dbe97f..4f9f0a5ef8c 100644 --- a/sys/arch/i386/stand/libsa/memprobe.c +++ b/sys/arch/i386/stand/libsa/memprobe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: memprobe.c,v 1.53 2014/03/29 18:09:29 guenther Exp $ */ +/* $OpenBSD: memprobe.c,v 1.54 2015/09/02 04:09:24 yasuoka Exp $ */ /* * Copyright (c) 1997-1999 Michael Shalayeff @@ -36,7 +36,8 @@ u_int cnvmem, extmem; /* XXX - compatibility */ - +bios_memmap_t bios_memmap[64]; /* This is easier */ +#ifndef EFIBOOT /* * Check gateA20 * @@ -232,7 +233,7 @@ addrprobe(u_int kloc) u_int save[nitems(addrprobe_pat)]; /* Get location */ - loc = (int *)(kloc * 1024); + loc = (int *)(intptr_t)(kloc * 1024); save[0] = *loc; /* Probe address */ @@ -295,7 +296,6 @@ badprobe(bios_memmap_t *mp) return ++mp; } -bios_memmap_t bios_memmap[64]; /* This is easier */ #ifndef _TEST void memprobe(void) @@ -366,6 +366,7 @@ memprobe(void) printf("a20=o%s] ", checkA20()? "n" : "ff!"); } #endif +#endif void dump_biosmem(bios_memmap_t *tm) |