git: 4b7fbd67ed82 - stable/14 - libsa: smbios: Make 'is_64bit_ep' a field of 'smbios'
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 08 Apr 2025 13:41:02 UTC
The branch stable/14 has been updated by olce:
URL: https://cgit.FreeBSD.org/src/commit/?id=4b7fbd67ed82be2a771c8de8c05e6347bdf8e276
commit 4b7fbd67ed82be2a771c8de8c05e6347bdf8e276
Author: Olivier Certner <olce@FreeBSD.org>
AuthorDate: 2025-03-03 16:29:04 +0000
Commit: Olivier Certner <olce@FreeBSD.org>
CommitDate: 2025-04-08 13:38:26 +0000
libsa: smbios: Make 'is_64bit_ep' a field of 'smbios'
No functional change.
Reviewed by: imp, markj
MFC after: 2 weeks
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D49282
(cherry picked from commit a39ab17c9abb74019f15b02970d8739c97d4185c)
---
stand/libsa/smbios.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/stand/libsa/smbios.c b/stand/libsa/smbios.c
index a45bc78b7ad0..a334e39e9eff 100644
--- a/stand/libsa/smbios.c
+++ b/stand/libsa/smbios.c
@@ -144,6 +144,9 @@ SMBIOS_GET64(const caddr_t base, int off)
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 @@ struct smbios_attr {
};
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 @@ smbios_sigsearch(const caddr_t addr, const uint32_t len)
/* 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 @@ smbios_probe(const caddr_t addr)
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 */