D49282.diff
No OneTemporary
Actions

Size

940 B

Referenced Files

None

Subscribers

None

D49282.diff
View Options

	diff --git a/stand/libsa/smbios.c b/stand/libsa/smbios.c
	--- a/stand/libsa/smbios.c
	+++ b/stand/libsa/smbios.c
	@@ -144,6 +144,9 @@

	struct smbios_attr {
	int probed;
	+#ifdef SMBIOS_64BIT_EP
	+ int is_64bit_ep;
	+#endif
	caddr_t addr;
	size_t length;
	size_t count;
	@@ -160,9 +163,6 @@
	};

	static struct smbios_attr smbios;
	-#ifdef SMBIOS_64BIT_EP
	-static int is_64bit_ep;
	-#endif

	static uint8_t
	smbios_checksum(const caddr_t addr, const uint8_t len)
	@@ -193,7 +193,7 @@
	/* v3.0, 64-bit Entry point */
	if (strncmp(cp, SMBIOS3_SIG, sizeof(SMBIOS3_SIG) - 1) == 0 &&
	smbios_checksum(cp, SMBIOS_GET8(cp, 0x06)) == 0) {
	- is_64bit_ep = 1;
	+ smbios.is_64bit_ep = 1;
	return (cp);
	}
	#endif
	@@ -562,7 +562,7 @@
	return;

	#ifdef SMBIOS_64BIT_EP
	- if (is_64bit_ep) {
	+ if (smbios.is_64bit_ep) {
	/* Structure Table Length */
	smbios.length = SMBIOS_GET32(saddr, 0x0c);
	/* Structure Table Address */