diff options
| author | mjg <mjg@FreeBSD.org> | 2016-12-31 13:05:48 +0000 |
|---|---|---|
| committer | mjg <mjg@FreeBSD.org> | 2016-12-31 13:05:48 +0000 |
| commit | 34f684e838cb21d18ccb1c5d7db662d87ee2c37a (patch) | |
| tree | 198bf93b1b46326efcb599905827846cc70447ab /sys/x86 | |
| parent | 57c2919e0d0e8bc07f304a2d1ef2fc9071204598 (diff) | |
| download | FreeBSD-src-34f684e838cb21d18ccb1c5d7db662d87ee2c37a.zip FreeBSD-src-34f684e838cb21d18ccb1c5d7db662d87ee2c37a.tar.gz | |
MFC r307653:
Mark a bunch of mpsafe sysctls as such.
This gives me a sysctl Giant-free buildworld.
Diffstat (limited to 'sys/x86')
| -rw-r--r-- | sys/x86/x86/identcpu.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/x86/x86/identcpu.c b/sys/x86/x86/identcpu.c index 11627ce..d4cc223 100644 --- a/sys/x86/x86/identcpu.c +++ b/sys/x86/x86/identcpu.c @@ -148,15 +148,15 @@ sysctl_hw_machine(SYSCTL_HANDLER_ARGS) return (error); } -SYSCTL_PROC(_hw, HW_MACHINE, machine, CTLTYPE_STRING | CTLFLAG_RD, - NULL, 0, sysctl_hw_machine, "A", "Machine class"); +SYSCTL_PROC(_hw, HW_MACHINE, machine, CTLTYPE_STRING | CTLFLAG_RD | + CTLFLAG_MPSAFE, NULL, 0, sysctl_hw_machine, "A", "Machine class"); #else SYSCTL_STRING(_hw, HW_MACHINE, machine, CTLFLAG_RD, machine, 0, "Machine class"); #endif static char cpu_model[128]; -SYSCTL_STRING(_hw, HW_MODEL, model, CTLFLAG_RD, +SYSCTL_STRING(_hw, HW_MODEL, model, CTLFLAG_RD | CTLFLAG_MPSAFE, cpu_model, 0, "Machine model"); static int hw_clockrate; @@ -165,8 +165,8 @@ SYSCTL_INT(_hw, OID_AUTO, clockrate, CTLFLAG_RD, u_int hv_high; char hv_vendor[16]; -SYSCTL_STRING(_hw, OID_AUTO, hv_vendor, CTLFLAG_RD, hv_vendor, 0, - "Hypervisor vendor"); +SYSCTL_STRING(_hw, OID_AUTO, hv_vendor, CTLFLAG_RD | CTLFLAG_MPSAFE, hv_vendor, + 0, "Hypervisor vendor"); static eventhandler_tag tsc_post_tag; |
