diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2021-01-28 18:54:53 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2021-01-28 18:54:53 +0000 |
| commit | cdb2b6a04e2b9584fa0d25d54260f930a18563db (patch) | |
| tree | 23d898b1640b8074e8594e27a5a20980158434c2 /sys/arch | |
| parent | 31e7b167b7488bbcaffcc41362d274162f584ab6 (diff) | |
bios_memmap[] should not be a common
ok kettenis
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/amd64/stand/efiboot/memprobe.c | 4 | ||||
| -rw-r--r-- | sys/arch/amd64/stand/libsa/memprobe.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sys/arch/amd64/stand/efiboot/memprobe.c b/sys/arch/amd64/stand/efiboot/memprobe.c index f2f51c9669d..34ac287b994 100644 --- a/sys/arch/amd64/stand/efiboot/memprobe.c +++ b/sys/arch/amd64/stand/efiboot/memprobe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: memprobe.c,v 1.1 2019/05/10 21:20:42 mlarkin Exp $ */ +/* $OpenBSD: memprobe.c,v 1.2 2021/01/28 18:54:50 deraadt Exp $ */ /* * Copyright (c) 1997-1999 Michael Shalayeff @@ -36,7 +36,7 @@ u_int cnvmem, extmem; /* XXX - compatibility */ -bios_memmap_t bios_memmap[64]; /* This is easier */ +extern bios_memmap_t bios_memmap[64]; /* This is easier */ void dump_biosmem(bios_memmap_t *tm) diff --git a/sys/arch/amd64/stand/libsa/memprobe.c b/sys/arch/amd64/stand/libsa/memprobe.c index 67ff6cee00b..785b1d0e623 100644 --- a/sys/arch/amd64/stand/libsa/memprobe.c +++ b/sys/arch/amd64/stand/libsa/memprobe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: memprobe.c,v 1.18 2019/05/10 21:20:43 mlarkin Exp $ */ +/* $OpenBSD: memprobe.c,v 1.19 2021/01/28 18:54:52 deraadt Exp $ */ /* * Copyright (c) 1997-1999 Michael Shalayeff @@ -37,6 +37,7 @@ u_int cnvmem, extmem; /* XXX - compatibility */ bios_memmap_t bios_memmap[64]; /* This is easier */ + /* * Check gateA20 * |