mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-10-19 02:29:40 +00:00
Code Issues Releases Activity

Mark a bunch of mpsafe sysctls as such.

Browse Source 
This gives me a sysctl Giant-free buildworld.
This commit is contained in:
Mateusz Guzik 2016-10-19 19:42:01 +00:00
parent 016e7731e7
commit 53dc58f2dc
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=307653
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/kern/kern_exec.c
View File

@ -118,14 +118,14 @@ static int do_execve(struct thread *td, struct image_args *args,
struct mac *mac_p); struct mac *mac_p);
/* XXX This should be vm_size_t. */ /* XXX This should be vm_size_t. */
SYSCTL_PROC(_kern, KERN_PS_STRINGS, ps_strings, CTLTYPE_ULONG|CTLFLAG_RD, SYSCTL_PROC(_kern, KERN_PS_STRINGS, ps_strings, CTLTYPE_ULONG|CTLFLAG_RD|
NULL, 0, sysctl_kern_ps_strings, "LU", ""); CTLFLAG_MPSAFE, NULL, 0, sysctl_kern_ps_strings, "LU", "");
/* XXX This should be vm_size_t. */ /* XXX This should be vm_size_t. */
SYSCTL_PROC(_kern, KERN_USRSTACK, usrstack, CTLTYPE_ULONG|CTLFLAG_RD| SYSCTL_PROC(_kern, KERN_USRSTACK, usrstack, CTLTYPE_ULONG|CTLFLAG_RD|
CTLFLAG_CAPRD, NULL, 0, sysctl_kern_usrstack, "LU", ""); CTLFLAG_CAPRD|CTLFLAG_MPSAFE, NULL, 0, sysctl_kern_usrstack, "LU", "");
SYSCTL_PROC(_kern, OID_AUTO, stackprot, CTLTYPE_INT|CTLFLAG_RD, SYSCTL_PROC(_kern, OID_AUTO, stackprot, CTLTYPE_INT|CTLFLAG_RD|CTLFLAG_MPSAFE,
NULL, 0, sysctl_kern_stackprot, "I", ""); NULL, 0, sysctl_kern_stackprot, "I", "");
u_long ps_arg_cache_limit = PAGE_SIZE / 16; u_long ps_arg_cache_limit = PAGE_SIZE / 16;

11
sys/kern/kern_mib.c
View File

@ -135,7 +135,7 @@ SYSCTL_INT(_kern, KERN_SAVED_IDS, saved_ids, CTLFLAG_RD|CTLFLAG_CAPRD,
char kernelname[MAXPATHLEN] = "/kernel"; /* XXX bloat */ char kernelname[MAXPATHLEN] = "/kernel"; /* XXX bloat */
SYSCTL_STRING(_kern, KERN_BOOTFILE, bootfile, CTLFLAG_RW, SYSCTL_STRING(_kern, KERN_BOOTFILE, bootfile, CTLFLAG_RW | CTLFLAG_MPSAFE,
kernelname, sizeof kernelname, "Name of kernel file booted"); kernelname, sizeof kernelname, "Name of kernel file booted");
SYSCTL_INT(_kern, KERN_MAXPHYS, maxphys, CTLFLAG_RD | CTLFLAG_CAPRD, SYSCTL_INT(_kern, KERN_MAXPHYS, maxphys, CTLFLAG_RD | CTLFLAG_CAPRD,
@ -257,8 +257,9 @@ sysctl_hw_machine_arch(SYSCTL_HANDLER_ARGS)
return (error); return (error);
} }
SYSCTL_PROC(_hw, HW_MACHINE_ARCH, machine_arch, CTLTYPE_STRING | CTLFLAG_RD, SYSCTL_PROC(_hw, HW_MACHINE_ARCH, machine_arch, CTLTYPE_STRING | CTLFLAG_RD |
NULL, 0, sysctl_hw_machine_arch, "A", "System architecture"); CTLFLAG_MPSAFE, NULL, 0, sysctl_hw_machine_arch, "A",
"System architecture");
SYSCTL_STRING(_kern, OID_AUTO, supported_archs, CTLFLAG_RD | CTLFLAG_MPSAFE, SYSCTL_STRING(_kern, OID_AUTO, supported_archs, CTLFLAG_RD | CTLFLAG_MPSAFE,
#ifdef COMPAT_FREEBSD32 #ifdef COMPAT_FREEBSD32
@ -386,8 +387,8 @@ SYSCTL_PROC(_kern, KERN_SECURELVL, securelevel,
/* Actual kernel configuration options. */ /* Actual kernel configuration options. */
extern char kernconfstring[]; extern char kernconfstring[];
SYSCTL_STRING(_kern, OID_AUTO, conftxt, CTLFLAG_RD, kernconfstring, 0, SYSCTL_STRING(_kern, OID_AUTO, conftxt, CTLFLAG_RD | CTLFLAG_MPSAFE,
"Kernel configuration file"); kernconfstring, 0, "Kernel configuration file");
#endif #endif
static int static int

10
sys/x86/x86/identcpu.c
View File

@ -148,15 +148,15 @@ sysctl_hw_machine(SYSCTL_HANDLER_ARGS)
return (error); return (error);
} }
SYSCTL_PROC(_hw, HW_MACHINE, machine, CTLTYPE_STRING | CTLFLAG_RD, SYSCTL_PROC(_hw, HW_MACHINE, machine, CTLTYPE_STRING | CTLFLAG_RD |
NULL, 0, sysctl_hw_machine, "A", "Machine class"); CTLFLAG_MPSAFE, NULL, 0, sysctl_hw_machine, "A", "Machine class");
#else #else
SYSCTL_STRING(_hw, HW_MACHINE, machine, CTLFLAG_RD, SYSCTL_STRING(_hw, HW_MACHINE, machine, CTLFLAG_RD,
machine, 0, "Machine class"); machine, 0, "Machine class");
#endif #endif
static char cpu_model[128]; 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"); cpu_model, 0, "Machine model");
static int hw_clockrate; static int hw_clockrate;
@ -165,8 +165,8 @@ SYSCTL_INT(_hw, OID_AUTO, clockrate, CTLFLAG_RD,
u_int hv_high; u_int hv_high;
char hv_vendor[16]; char hv_vendor[16];
SYSCTL_STRING(_hw, OID_AUTO, hv_vendor, CTLFLAG_RD, hv_vendor, 0, SYSCTL_STRING(_hw, OID_AUTO, hv_vendor, CTLFLAG_RD | CTLFLAG_MPSAFE, hv_vendor,
"Hypervisor vendor"); 0, "Hypervisor vendor");
static eventhandler_tag tsc_post_tag; static eventhandler_tag tsc_post_tag;