Declare hw_{prod,serial,uuid,vendor,ver} in <sys/systm.h>.

OK deraadt@, mpi@

29 files changed, 36 insertions, 90 deletions

diff --git a/sys/arch/alpha/alpha/machdep.c b/sys/arch/alpha/alpha/machdep.c
index 60ff2b8e3e0..717ecd5d751 100644
--- a/sys/arch/alpha/alpha/machdep.c
+++ b/sys/arch/alpha/alpha/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.192 2020/06/05 14:25:05 naddy Exp $ */
+/* $OpenBSD: machdep.c,v 1.193 2020/08/26 03:29:05 visa Exp $ */
 /* $NetBSD: machdep.c,v 1.210 2000/06/01 17:12:38 thorpej Exp $ */
 
 /*-
@@ -190,9 +190,6 @@ int	alpha_fp_sync_complete = 0;	/* fp fixup if sync even without /s */
 int	alpha_led_blink = 1;
 #endif
 
-/* used by hw_sysctl */
-extern char *hw_serial;
-
 /*
  * XXX This should be dynamically sized, but we have the chicken-egg problem!
  * XXX it should also be larger than it is, because not all of the mddt
diff --git a/sys/arch/amd64/amd64/bios.c b/sys/arch/amd64/amd64/bios.c
index c6c38c89661..8d534c85716 100644
--- a/sys/arch/amd64/amd64/bios.c
+++ b/sys/arch/amd64/amd64/bios.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bios.c,v 1.42 2020/05/29 04:42:23 deraadt Exp $	*/
+/*	$OpenBSD: bios.c,v 1.43 2020/08/26 03:29:05 visa Exp $	*/
 /*
  * Copyright (c) 2006 Gordon Willem Klok <gklok@cogeco.ca>
  *
@@ -53,10 +53,6 @@ struct cfdriver bios_cd = {
 };
 
 struct smbios_entry smbios_entry;
-/*
- * used by hw_sysctl
- */
-extern char *hw_vendor, *hw_prod, *hw_uuid, *hw_serial, *hw_ver;
 
 const char *smbios_uninfo[] = {
 	"System",
diff --git a/sys/arch/arm/mainbus/mainbus.c b/sys/arch/arm/mainbus/mainbus.c
index 309a96ec42d..ea2e34ddd38 100644
--- a/sys/arch/arm/mainbus/mainbus.c
+++ b/sys/arch/arm/mainbus/mainbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mainbus.c,v 1.22 2020/04/29 15:25:07 kettenis Exp $ */
+/* $OpenBSD: mainbus.c,v 1.23 2020/08/26 03:29:05 visa Exp $ */
 /*
  * Copyright (c) 2016 Patrick Wildt <patrick@blueri.se>
  * Copyright (c) 2017 Mark Kettenis <kettenis@openbsd.org>
@@ -87,8 +87,6 @@ mainbus_match(struct device *parent, void *cfdata, void *aux)
 	return (1);
 }
 
-extern char *hw_prod;
-extern char *hw_serial;
 extern struct bus_space armv7_bs_tag;
 void platform_init_mainbus(struct device *);
 
diff --git a/sys/arch/arm64/dev/mainbus.c b/sys/arch/arm64/dev/mainbus.c
index 18ebf9c5f64..2a257ac6300 100644
--- a/sys/arch/arm64/dev/mainbus.c
+++ b/sys/arch/arm64/dev/mainbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mainbus.c,v 1.18 2020/07/04 13:01:16 kettenis Exp $ */
+/* $OpenBSD: mainbus.c,v 1.19 2020/08/26 03:29:05 visa Exp $ */
 /*
  * Copyright (c) 2016 Patrick Wildt <patrick@blueri.se>
  * Copyright (c) 2017 Mark Kettenis <kettenis@openbsd.org>
@@ -94,8 +94,6 @@ mainbus_match(struct device *parent, void *cfdata, void *aux)
 	return (1);
 }
 
-extern char *hw_prod;
-extern char *hw_serial;
 void agtimer_init(void);
 
 void
diff --git a/sys/arch/arm64/dev/smbios.c b/sys/arch/arm64/dev/smbios.c
index ba47908d3e7..09b1725578f 100644
--- a/sys/arch/arm64/dev/smbios.c
+++ b/sys/arch/arm64/dev/smbios.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: smbios.c,v 1.5 2020/05/29 04:42:23 deraadt Exp $	*/
+/*	$OpenBSD: smbios.c,v 1.6 2020/08/26 03:29:05 visa Exp $	*/
 /*
  * Copyright (c) 2006 Gordon Willem Klok <gklok@cogeco.ca>
  * Copyright (c) 2019 Mark Kettenis <kettenis@openbsd.org>
@@ -28,10 +28,6 @@
 #include <dev/ofw/fdt.h>
 
 struct smbios_entry smbios_entry;
-/*
- * used by hw_sysctl
- */
-extern char *hw_vendor, *hw_prod, *hw_uuid, *hw_serial, *hw_ver;
 
 const char *smbios_uninfo[] = {
 	"System",
diff --git a/sys/arch/i386/i386/bios.c b/sys/arch/i386/i386/bios.c
index 7153736f17c..f55aad04eed 100644
--- a/sys/arch/i386/i386/bios.c
+++ b/sys/arch/i386/i386/bios.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bios.c,v 1.125 2020/05/29 04:42:23 deraadt Exp $	*/
+/*	$OpenBSD: bios.c,v 1.126 2020/08/26 03:29:05 visa Exp $	*/
 
 /*
  * Copyright (c) 1997-2001 Michael Shalayeff
@@ -126,10 +126,6 @@ void		smbios_info(char*);
 
 bios_diskinfo_t *bios_getdiskinfo(dev_t);
 
-/*
- * used by hw_sysctl
- */
-extern char *hw_vendor, *hw_prod, *hw_uuid, *hw_serial, *hw_ver;
 const char *smbios_uninfo[] = {
 	"System",
 	"Not ",
diff --git a/sys/arch/loongson/loongson/machdep.c b/sys/arch/loongson/loongson/machdep.c
index 3057cdbea61..9a23277dd79 100644
--- a/sys/arch/loongson/loongson/machdep.c
+++ b/sys/arch/loongson/loongson/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.89 2020/06/05 13:35:20 visa Exp $ */
+/*	$OpenBSD: machdep.c,v 1.90 2020/08/26 03:29:05 visa Exp $ */
 
 /*
  * Copyright (c) 2009, 2010, 2014 Miodrag Vallat.
@@ -516,7 +516,6 @@ mips_init(uint64_t argc, uint64_t argv, uint64_t envp, uint64_t cv,
 
 	extern char start[], edata[], end[];
 	extern char exception[], e_exception[];
-	extern char *hw_vendor, *hw_prod;
 	extern void xtlb_miss;
 
 #ifdef MULTIPROCESSOR
diff --git a/sys/arch/macppc/dev/aoa.c b/sys/arch/macppc/dev/aoa.c
index 85b015a58b5..a2ca8e10a95 100644
--- a/sys/arch/macppc/dev/aoa.c
+++ b/sys/arch/macppc/dev/aoa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aoa.c,v 1.10 2020/06/06 21:01:30 gkoehler Exp $	*/
+/*	$OpenBSD: aoa.c,v 1.11 2020/08/26 03:29:06 visa Exp $	*/
 
 /*-
  * Copyright (c) 2005 Tsubai Masanari.  All rights reserved.
@@ -57,8 +57,6 @@ void aoa_attach(struct device *, struct device *, void *);
 void aoa_defer(struct device *);
 void aoa_set_volume(struct aoa_softc *, int, int);
 
-extern char *hw_prod;
-
 struct cfattach aoa_ca = {
 	sizeof(struct aoa_softc), aoa_match, aoa_attach
 };
diff --git a/sys/arch/macppc/dev/snapper.c b/sys/arch/macppc/dev/snapper.c
index a4ebd7f54f3..3fbf58aec0f 100644
--- a/sys/arch/macppc/dev/snapper.c
+++ b/sys/arch/macppc/dev/snapper.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: snapper.c,v 1.38 2020/06/06 21:01:30 gkoehler Exp $	*/
+/*	$OpenBSD: snapper.c,v 1.39 2020/08/26 03:29:06 visa Exp $	*/
 /*	$NetBSD: snapper.c,v 1.1 2003/12/27 02:19:34 grant Exp $	*/
 
 /*-
@@ -70,8 +70,6 @@ void snapper_set_input(struct snapper_softc *, int);
 int tas3004_write(struct snapper_softc *, u_int, const void *);
 int tas3004_init(struct snapper_softc *);
 
-extern char *hw_prod;
-
 struct cfattach snapper_ca = {
 	sizeof(struct snapper_softc), snapper_match, snapper_attach
 };
diff --git a/sys/arch/macppc/macppc/clock.c b/sys/arch/macppc/macppc/clock.c
index c582edac1b9..7ff7ba2635b 100644
--- a/sys/arch/macppc/macppc/clock.c
+++ b/sys/arch/macppc/macppc/clock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: clock.c,v 1.46 2020/07/17 20:15:43 gkoehler Exp $	*/
+/*	$OpenBSD: clock.c,v 1.47 2020/08/26 03:29:06 visa Exp $	*/
 /*	$NetBSD: clock.c,v 1.1 1996/09/30 16:34:40 ws Exp $	*/
 
 /*
@@ -64,7 +64,6 @@ static struct timecounter tb_timecounter = {
 static const char *calibrate_tc_models[] = {
 	"PowerMac10,1"
 };
-extern char *hw_prod;
 
 time_read_t  *time_read;
 time_write_t *time_write;
diff --git a/sys/arch/macppc/macppc/mainbus.c b/sys/arch/macppc/macppc/mainbus.c
index 13c6bdc5dca..bbd69252403 100644
--- a/sys/arch/macppc/macppc/mainbus.c
+++ b/sys/arch/macppc/macppc/mainbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mainbus.c,v 1.25 2015/09/06 16:46:53 deraadt Exp $	*/
+/*	$OpenBSD: mainbus.c,v 1.26 2020/08/26 03:29:06 visa Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -47,9 +47,6 @@ struct cfdriver mainbus_cd = {
 	NULL, "mainbus", DV_DULL
 };
 
-/* hw.product sysctl see sys/kern/kern_sysctl.c */
-extern char *hw_prod, *hw_ver, *hw_vendor;
-
 #define HH_REG_CONF 	0x90
 
 /*ARGSUSED*/
diff --git a/sys/arch/powerpc64/dev/mainbus.c b/sys/arch/powerpc64/dev/mainbus.c
index f15c5f663a3..211d3e1a480 100644
--- a/sys/arch/powerpc64/dev/mainbus.c
+++ b/sys/arch/powerpc64/dev/mainbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mainbus.c,v 1.4 2020/07/21 20:23:35 kettenis Exp $ */
+/* $OpenBSD: mainbus.c,v 1.5 2020/08/26 03:29:06 visa Exp $ */
 /*
  * Copyright (c) 2016 Patrick Wildt <patrick@blueri.se>
  * Copyright (c) 2017 Mark Kettenis <kettenis@openbsd.org>
@@ -110,9 +110,6 @@ mainbus_match(struct device *parent, void *cfdata, void *aux)
 	return (1);
 }
 
-extern char *hw_prod;
-extern char *hw_serial;
-
 void
 mainbus_attach(struct device *parent, struct device *self, void *aux)
 {
diff --git a/sys/arch/sgi/sgi/ip22_machdep.c b/sys/arch/sgi/sgi/ip22_machdep.c
index 664db4eb1ef..fa51790df42 100644
--- a/sys/arch/sgi/sgi/ip22_machdep.c
+++ b/sys/arch/sgi/sgi/ip22_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip22_machdep.c,v 1.22 2016/10/09 11:25:40 tom Exp $	*/
+/*	$OpenBSD: ip22_machdep.c,v 1.23 2020/08/26 03:29:06 visa Exp $	*/
 
 /*
  * Copyright (c) 2012 Miodrag Vallat.
@@ -56,8 +56,6 @@
 #include <sgi/localbus/tccvar.h>
 #endif
 
-extern char *hw_prod;
-
 int	hpc_old = 0;
 int	bios_year;
 int	ip22_ecc = 0;
diff --git a/sys/arch/sgi/sgi/ip27_machdep.c b/sys/arch/sgi/sgi/ip27_machdep.c
index 93997886918..def643d0e9d 100644
--- a/sys/arch/sgi/sgi/ip27_machdep.c
+++ b/sys/arch/sgi/sgi/ip27_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip27_machdep.c,v 1.81 2020/07/06 13:33:08 pirofti Exp $	*/
+/*	$OpenBSD: ip27_machdep.c,v 1.82 2020/08/26 03:29:06 visa Exp $	*/
 
 /*
  * Copyright (c) 2008, 2009 Miodrag Vallat.
@@ -56,8 +56,6 @@
 
 #include <dev/cons.h>
 
-extern char *hw_prod;
-
 extern void (*md_halt)(int);
 
 paddr_t	ip27_widget_short(int16_t, u_int);
diff --git a/sys/arch/sgi/sgi/ip30_machdep.c b/sys/arch/sgi/sgi/ip30_machdep.c
index 6d50f852f3d..6638d8671e1 100644
--- a/sys/arch/sgi/sgi/ip30_machdep.c
+++ b/sys/arch/sgi/sgi/ip30_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip30_machdep.c,v 1.69 2018/01/29 14:51:57 visa Exp $	*/
+/*	$OpenBSD: ip30_machdep.c,v 1.70 2020/08/26 03:29:06 visa Exp $	*/
 
 /*
  * Copyright (c) 2008, 2009 Miodrag Vallat.
@@ -48,8 +48,6 @@
 
 #include <dev/ic/comvar.h>
 
-extern char *hw_prod;
-
 extern int	mbprint(void *, const char *);
 
 #ifdef MULTIPROCESSOR
diff --git a/sys/arch/sgi/sgi/ip32_machdep.c b/sys/arch/sgi/sgi/ip32_machdep.c
index 0fd4cbf682e..e81ecef122a 100644
--- a/sys/arch/sgi/sgi/ip32_machdep.c
+++ b/sys/arch/sgi/sgi/ip32_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip32_machdep.c,v 1.23 2018/12/13 16:35:07 visa Exp $ */
+/*	$OpenBSD: ip32_machdep.c,v 1.24 2020/08/26 03:29:06 visa Exp $ */
 
 /*
  * Copyright (c) 2003-2004 Opsycon AB  (www.opsycon.se / www.opsycon.com)
@@ -49,7 +49,6 @@
 
 #include <dev/ic/comvar.h>
 
-extern char *hw_prod;
 extern int tlb_set_wired_get_random(int);	/* tlbhandler.S */
 
 void crime_configure_memory(void);
diff --git a/sys/arch/sgi/sgi/machdep.c b/sys/arch/sgi/sgi/machdep.c
index 5a1c219dc27..ca0d9d759d2 100644
--- a/sys/arch/sgi/sgi/machdep.c
+++ b/sys/arch/sgi/sgi/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.163 2020/06/05 13:35:21 visa Exp $ */
+/*	$OpenBSD: machdep.c,v 1.164 2020/08/26 03:29:06 visa Exp $ */
 
 /*
  * Copyright (c) 2003-2004 Opsycon AB  (www.opsycon.se / www.opsycon.com)
@@ -144,7 +144,6 @@ mips_init(int argc, void *argv, caddr_t boot_esym)
 	u_int cpufamily;
 	struct cpu_info *ci;
 	extern char start[], edata[], end[];
-	extern char *hw_vendor;
 #ifndef CPU_R8000
 	extern char cache_err[], exception[], e_exception[];
 	vaddr_t xtlb_handler;
diff --git a/sys/arch/sgi/sgi/mainbus.c b/sys/arch/sgi/sgi/mainbus.c
index c045647abb9..a066a2b8ae5 100644
--- a/sys/arch/sgi/sgi/mainbus.c
+++ b/sys/arch/sgi/sgi/mainbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mainbus.c,v 1.13 2012/09/29 21:46:02 miod Exp $ */
+/*	$OpenBSD: mainbus.c,v 1.14 2020/08/26 03:29:06 visa Exp $ */
 
 /*
  * Copyright (c) 2001-2003 Opsycon AB  (www.opsycon.se / www.opsycon.com)
@@ -62,7 +62,6 @@ void
 mbattach(struct device *parent, struct device *self, void *aux)
 {
 	struct cpu_attach_args caa;
-	extern char *hw_prod;
 
 	if (hw_prod != NULL)
 		printf(": %s", hw_prod);
diff --git a/sys/arch/sparc64/sparc64/autoconf.c b/sys/arch/sparc64/sparc64/autoconf.c
index 3036002fdfa..22dc038d5c5 100644
--- a/sys/arch/sparc64/sparc64/autoconf.c
+++ b/sys/arch/sparc64/sparc64/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.137 2020/07/16 21:18:29 krw Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.138 2020/08/26 03:29:06 visa Exp $	*/
 /*	$NetBSD: autoconf.c,v 1.51 2001/07/24 19:32:11 eeh Exp $ */
 
 /*
@@ -122,9 +122,6 @@ int	optionsnode;	/* node ID of ROM's options */
 
 static	int rootnode;
 
-/* for hw.product/vendor see sys/kern/kern_sysctl.c */
-extern char *hw_prod, *hw_vendor;
-
 static	char *str2hex(char *, long *);
 static	int mbprint(void *, const char *);
 void	sync_crash(void);
diff --git a/sys/dev/acpi/acpials.c b/sys/dev/acpi/acpials.c
index 6d8ddc6009d..36a1c12493c 100644
--- a/sys/dev/acpi/acpials.c
+++ b/sys/dev/acpi/acpials.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpials.c,v 1.3 2017/03/13 14:44:37 jcs Exp $ */
+/* $OpenBSD: acpials.c,v 1.4 2020/08/26 03:29:06 visa Exp $ */
 /*
  * Ambient Light Sensor device driver
  * ACPI 5.0 spec section 9.2
@@ -74,8 +74,6 @@ const char *acpials_hids[] = {
 	NULL
 };
 
-extern char *hw_vendor;
-
 int
 acpials_match(struct device *parent, void *match, void *aux)
 {
diff --git a/sys/dev/acpi/acpiec.c b/sys/dev/acpi/acpiec.c
index 6c1f6d3535a..6c6a547423d 100644
--- a/sys/dev/acpi/acpiec.c
+++ b/sys/dev/acpi/acpiec.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpiec.c,v 1.61 2020/07/21 03:48:06 deraadt Exp $ */
+/* $OpenBSD: acpiec.c,v 1.62 2020/08/26 03:29:06 visa Exp $ */
 /*
  * Copyright (c) 2006 Can Erkin Acar <canacar@openbsd.org>
  *
@@ -77,8 +77,6 @@ void		acpiec_unlock(struct acpiec_softc *);
 
 int	acpiec_reg(struct acpiec_softc *);
 
-extern char	*hw_vendor, *hw_prod;
-
 struct cfattach acpiec_ca = {
 	sizeof(struct acpiec_softc), acpiec_match, acpiec_attach
 };
diff --git a/sys/dev/acpi/dsdt.c b/sys/dev/acpi/dsdt.c
index b7ecc4e63be..3c6bf6ff1db 100644
--- a/sys/dev/acpi/dsdt.c
+++ b/sys/dev/acpi/dsdt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dsdt.c,v 1.252 2020/07/21 03:48:06 deraadt Exp $ */
+/* $OpenBSD: dsdt.c,v 1.253 2020/08/26 03:29:06 visa Exp $ */
 /*
  * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org>
  *
@@ -108,8 +108,6 @@ __dead void		_aml_die(const char *fn, int line, const char *fmt, ...);
 void aml_notify_task(void *, int);
 void acpi_poll_notify_task(void *, int);
 
-extern char		*hw_vendor;
-
 /*
  * @@@: Global variables
  */
diff --git a/sys/dev/i2c/iatp.c b/sys/dev/i2c/iatp.c
index cb5021dcfb5..216fb0e4b3e 100644
--- a/sys/dev/i2c/iatp.c
+++ b/sys/dev/i2c/iatp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: iatp.c,v 1.7 2020/01/09 14:35:19 mpi Exp $ */
+/* $OpenBSD: iatp.c,v 1.8 2020/08/26 03:29:06 visa Exp $ */
 /*
  * Atmel maXTouch i2c touchscreen/touchpad driver
  * Copyright (c) 2016 joshua stein <jcs@openbsd.org>
@@ -212,9 +212,6 @@ void	iatp_t19_proc_msg(struct iatp_softc *, uint8_t *);
 int	iatp_t44_read_count(struct iatp_softc *);
 void	iatp_t100_proc_msg(struct iatp_softc *, uint8_t *);
 
-/* for gpio pin mapping */
-extern char *hw_vendor, *hw_prod;
-
 const struct wsmouse_accessops iatp_accessops = {
 	iatp_enable,
 	iatp_ioctl,
diff --git a/sys/dev/ic/re.c b/sys/dev/ic/re.c
index 9a0ad251d86..78eb8e07843 100644
--- a/sys/dev/ic/re.c
+++ b/sys/dev/ic/re.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: re.c,v 1.206 2020/07/10 13:26:37 patrick Exp $	*/
+/*	$OpenBSD: re.c,v 1.207 2020/08/26 03:29:06 visa Exp $	*/
 /*	$FreeBSD: if_re.c,v 1.31 2004/09/04 07:54:05 ru Exp $	*/
 /*
  * Copyright (c) 1997, 1998-2003
@@ -199,8 +199,6 @@ struct cfdriver re_cd = {
 	0, "re", DV_IFNET
 };
 
-extern char *hw_vendor, *hw_prod;
-
 #define EE_SET(x)					\
 	CSR_WRITE_1(sc, RL_EECMD,			\
 		CSR_READ_1(sc, RL_EECMD) | x)
diff --git a/sys/dev/isa/asmc.c b/sys/dev/isa/asmc.c
index b3c06373417..69ebffca300 100644
--- a/sys/dev/isa/asmc.c
+++ b/sys/dev/isa/asmc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: asmc.c,v 1.32 2017/08/22 11:00:39 jsg Exp $	*/
+/*	$OpenBSD: asmc.c,v 1.33 2020/08/26 03:29:06 visa Exp $	*/
 /*
  * Copyright (c) 2015 Joerg Jung <jung@openbsd.org>
  *
@@ -226,8 +226,6 @@ static const char *asmc_light_desc[ASMC_MAXLIGHT] = {
 	"left", "right"
 };
 
-extern char *hw_vendor, *hw_prod;
-
 int
 asmc_match(struct device *parent, void *match, void *aux)
 {
diff --git a/sys/dev/isa/skgpio.c b/sys/dev/isa/skgpio.c
index 10162ff0ed7..48d8d19d85a 100644
--- a/sys/dev/isa/skgpio.c
+++ b/sys/dev/isa/skgpio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: skgpio.c,v 1.3 2015/03/14 03:38:47 jsg Exp $ */
+/*	$OpenBSD: skgpio.c,v 1.4 2020/08/26 03:29:06 visa Exp $ */
 
 /*
  * Copyright (c) 2014 Matt Dainty <matt@bodgit-n-scarper.com>
@@ -45,8 +45,6 @@
 #define	SKGPIO_LED_ERROR	0x01c	/* Offset to error LED */
 #define	SKGPIO_LED_READY	0x01d	/* Offset to ready LED */
 
-extern char *hw_vendor, *hw_prod;
-
 const u_int skgpio_led_offset[SKGPIO_NLEDS] = {
 	SKGPIO_LED_ERROR, SKGPIO_LED_READY
 };
diff --git a/sys/dev/pci/drm/drm_linux.c b/sys/dev/pci/drm/drm_linux.c
index d0d6965a784..2cbd0905406 100644
--- a/sys/dev/pci/drm/drm_linux.c
+++ b/sys/dev/pci/drm/drm_linux.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: drm_linux.c,v 1.62 2020/08/03 07:02:08 jsg Exp $	*/
+/*	$OpenBSD: drm_linux.c,v 1.63 2020/08/26 03:29:06 visa Exp $	*/
 /*
  * Copyright (c) 2013 Jonathan Gray <jsg@openbsd.org>
  * Copyright (c) 2015, 2016 Mark Kettenis <kettenis@openbsd.org>
@@ -17,6 +17,7 @@
  */
 
 #include <sys/types.h>
+#include <sys/systm.h>
 #include <sys/param.h>
 #include <sys/event.h>
 #include <sys/filedesc.h>
@@ -303,8 +304,6 @@ kthread_stop(struct proc *p)
 	free(thread, M_DRM, sizeof(*thread));
 }
 
-extern char *hw_vendor, *hw_prod, *hw_ver;
-
 #if NBIOS > 0
 extern char smbios_board_vendor[];
 extern char smbios_board_prod[];
diff --git a/sys/dev/pv/pvbus.c b/sys/dev/pv/pvbus.c
index 00c64647dc9..19098a28d2f 100644
--- a/sys/dev/pv/pvbus.c
+++ b/sys/dev/pv/pvbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pvbus.c,v 1.21 2020/05/29 04:42:25 deraadt Exp $	*/
+/*	$OpenBSD: pvbus.c,v 1.22 2020/08/26 03:29:06 visa Exp $	*/
 
 /*
  * Copyright (c) 2015 Reyk Floeter <reyk@openbsd.org>
@@ -43,7 +43,6 @@
 
 int has_hv_cpuid = 0;
 
-extern char *hw_vendor;
 extern void rdrand(void *);
 
 int	 pvbus_activate(struct device *, int);
diff --git a/sys/sys/systm.h b/sys/sys/systm.h
index b4493a8c8d4..c98203833b3 100644
--- a/sys/sys/systm.h
+++ b/sys/sys/systm.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: systm.h,v 1.147 2020/05/29 04:42:25 deraadt Exp $	*/
+/*	$OpenBSD: systm.h,v 1.148 2020/08/26 03:29:07 visa Exp $	*/
 /*	$NetBSD: systm.h,v 1.50 1996/06/09 04:55:09 briggs Exp $	*/
 
 /*-
@@ -81,6 +81,12 @@ extern const char osrelease[];
 extern int cold;		/* cold start flag initialized in locore */
 extern int db_active;		/* running currently inside ddb(4) */
 
+extern char *hw_vendor;		/* sysctl hw.vendor */
+extern char *hw_prod;		/* sysctl hw.product */
+extern char *hw_uuid;		/* sysctl hw.uuid */
+extern char *hw_serial;		/* sysctl hw.serialno */
+extern char *hw_ver;		/* sysctl hw.version */
+
 extern int ncpus;		/* number of CPUs used */
 extern int ncpusfound;		/* number of CPUs found */
 extern int nblkdev;		/* number of entries in bdevsw */