Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 11 Jan 2024 14:32:31 GMT
From:      Mark Johnston <markj@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 675c24cd01f7 - stable/14 - x86: Make cpu_model[] public
Message-ID:  <202401111432.40BEWV2T023995@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=675c24cd01f7a115806f17bb7b7ac6fd30d3872a

commit 675c24cd01f7a115806f17bb7b7ac6fd30d3872a
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2024-01-04 13:24:04 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2024-01-11 14:19:05 +0000

    x86: Make cpu_model[] public
    
    No functional change intended.
    
    Reviewed by:    emaste, imp, kib
    MFC after:      1 week
    Differential Revision:  https://reviews.freebsd.org/D43281
    
    (cherry picked from commit d63ea03674007451682334fa3897918c5c3711a4)
---
 sys/x86/include/x86_var.h | 1 +
 sys/x86/x86/identcpu.c    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/sys/x86/include/x86_var.h b/sys/x86/include/x86_var.h
index 44314456d8bf..f3677d84570b 100644
--- a/sys/x86/include/x86_var.h
+++ b/sys/x86/include/x86_var.h
@@ -58,6 +58,7 @@ extern	u_int	cpu_mxcsr_mask;
 extern	u_int	cpu_procinfo;
 extern	u_int	cpu_procinfo2;
 extern	char	cpu_vendor[];
+extern	char	cpu_model[];
 extern	u_int	cpu_vendor_id;
 extern	u_int	cpu_mon_mwait_flags;
 extern	u_int	cpu_mon_min_size;
diff --git a/sys/x86/x86/identcpu.c b/sys/x86/x86/identcpu.c
index 7b06ecab2ad5..7fa35bd50244 100644
--- a/sys/x86/x86/identcpu.c
+++ b/sys/x86/x86/identcpu.c
@@ -157,7 +157,7 @@ SYSCTL_STRING(_hw, HW_MACHINE, machine, CTLFLAG_RD | CTLFLAG_CAPRD,
     machine, 0, "Machine class");
 #endif
 
-static char cpu_model[128];
+char cpu_model[128];
 SYSCTL_STRING(_hw, HW_MODEL, model, CTLFLAG_RD | CTLFLAG_MPSAFE,
     cpu_model, 0, "Machine model");
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401111432.40BEWV2T023995>