D49289.1789645548.diff
No OneTemporary
Actions

Size

1018 B

Referenced Files

None

Subscribers

None

D49289.1789645548.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
	@@ -139,7 +139,6 @@
	#define SMBIOS_GETSTR(base) ((base) + SMBIOS_GETLEN(base))

	struct smbios_attr {
	- int probed;
	int is_64bit_ep;
	caddr_t addr;
	size_t length;
	@@ -572,10 +571,6 @@
	int maj_off;
	int min_off;

	- if (smbios.probed)
	- return;
	- smbios.probed = 1;
	-
	/* Search signatures and validate checksums. */
	saddr = smbios_sigsearch(addr ? addr : PTOV(SMBIOS_START),
	SMBIOS_LENGTH);
	@@ -683,8 +678,14 @@
	smbios_match(const char* bios_vendor, const char* maker,
	const char* product)
	{
	- /* XXXRP currently, only called from non-EFI. */
	- smbios_probe(NULL);
	+ static bool probed = false;
	+
	+ if (!probed) {
	+ /* XXXRP currently, only called from non-EFI. */
	+ probed = true;
	+ smbios_probe(NULL);
	+ }
	+
	return (smbios_match_str(bios_vendor, smbios.bios_vendor) &&
	smbios_match_str(maker, smbios.maker) &&
	smbios_match_str(product, smbios.product));