From: deraadt <deraadt@openbsd.org>
Date: Thu, 28 Jan 2021 18:54:50 +0000 (+0000)
Subject: bios_memmap[] should not be a common
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=e72ddb449b37f5f5425e42622b759daf909f7e4e;p=openbsd

bios_memmap[] should not be a common
ok kettenis
---

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
  *