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

OK deraadt@, mpi@

9 files changed, 10 insertions, 27 deletions

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);