6 files changed, 45 insertions, 31 deletions

diff --git a/sys/i386/i386/elan-mmcr.c b/sys/i386/i386/elan-mmcr.c
index 81b573c27f0c2..1d1115fb6bc0e 100644
--- a/sys/i386/i386/elan-mmcr.c
+++ b/sys/i386/i386/elan-mmcr.c
@@ -221,8 +221,10 @@ sysctl_machdep_elan_gpio_config(SYSCTL_HANDLER_ARGS)
 	return (0);
 }
 
-SYSCTL_OID(_machdep, OID_AUTO, elan_gpio_config, CTLTYPE_STRING | CTLFLAG_RW,
-    NULL, 0, sysctl_machdep_elan_gpio_config, "A", "Elan CPU GPIO pin config");
+SYSCTL_OID(_machdep, OID_AUTO, elan_gpio_config,
+    CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_NEEDGIANT, NULL, 0,
+    sysctl_machdep_elan_gpio_config, "A",
+    "Elan CPU GPIO pin config");
 
 #ifdef CPU_ELAN_PPS
 static void
@@ -321,8 +323,10 @@ sysctl_machdep_elan_freq(SYSCTL_HANDLER_ARGS)
 	return (error);
 }
 
-SYSCTL_PROC(_machdep, OID_AUTO, elan_freq, CTLTYPE_UINT | CTLFLAG_RW,
-    0, sizeof (u_int), sysctl_machdep_elan_freq, "IU", "");
+SYSCTL_PROC(_machdep, OID_AUTO, elan_freq,
+    CTLTYPE_UINT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, 0, sizeof (u_int),
+    sysctl_machdep_elan_freq, "IU",
+    "");
 
 /*
  * Positively identifying the Elan can only be done through the PCI id of
diff --git a/sys/i386/i386/longrun.c b/sys/i386/i386/longrun.c
index bb403970a27e3..3403a3f0e49b5 100644
--- a/sys/i386/i386/longrun.c
+++ b/sys/i386/i386/longrun.c
@@ -276,31 +276,34 @@ setup_tmx86_longrun(void *dummy __unused)
 
 	sysctl_ctx_init(&crusoe_sysctl_ctx);
 	crusoe_sysctl_tree = SYSCTL_ADD_NODE(&crusoe_sysctl_ctx,
-				SYSCTL_STATIC_CHILDREN(_hw), OID_AUTO,
-				"crusoe", CTLFLAG_RD, 0,
-				"Transmeta Crusoe LongRun support");
+	    SYSCTL_STATIC_CHILDREN(_hw), OID_AUTO, "crusoe",
+	    CTLFLAG_RD | CTLFLAG_MPSAFE, 0,
+	    "Transmeta Crusoe LongRun support");
 	SYSCTL_ADD_PROC(&crusoe_sysctl_ctx, SYSCTL_CHILDREN(crusoe_sysctl_tree),
-		OID_AUTO, "longrun", CTLTYPE_INT | CTLFLAG_RW,
-		&crusoe_longrun, 0, tmx86_longrun_sysctl, "I",
-		"LongRun mode [0-3]");
+	    OID_AUTO, "longrun", CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT,
+	    &crusoe_longrun, 0, tmx86_longrun_sysctl, "I",
+	    "LongRun mode [0-3]");
 	SYSCTL_ADD_PROC(&crusoe_sysctl_ctx, SYSCTL_CHILDREN(crusoe_sysctl_tree),
-		OID_AUTO, "frequency", CTLTYPE_INT | CTLFLAG_RD,
-		&crusoe_frequency, 0, tmx86_status_sysctl, "I",
-		"Current frequency (MHz)");
+	    OID_AUTO, "frequency", CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_NEEDGIANT,
+	    &crusoe_frequency, 0, tmx86_status_sysctl, "I",
+	    "Current frequency (MHz)");
 	SYSCTL_ADD_PROC(&crusoe_sysctl_ctx, SYSCTL_CHILDREN(crusoe_sysctl_tree),
-		OID_AUTO, "voltage", CTLTYPE_INT | CTLFLAG_RD,
-		&crusoe_voltage, 0, tmx86_status_sysctl, "I",
-		"Current voltage (mV)");
+	    OID_AUTO, "voltage", CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_NEEDGIANT,
+	    &crusoe_voltage, 0, tmx86_status_sysctl, "I",
+	    "Current voltage (mV)");
 	SYSCTL_ADD_PROC(&crusoe_sysctl_ctx, SYSCTL_CHILDREN(crusoe_sysctl_tree),
-		OID_AUTO, "percentage", CTLTYPE_INT | CTLFLAG_RD,
-		&crusoe_percentage, 0, tmx86_status_sysctl, "I",
-		"Processing performance (%)");
+	    OID_AUTO, "percentage",
+	    CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_NEEDGIANT, &crusoe_percentage,
+	    0, tmx86_status_sysctl, "I", "Processing performance (%)");
 	SYSCTL_ADD_PROC(&crusoe_sysctl_ctx, SYSCTL_CHILDREN(crusoe_sysctl_tree),
-		OID_AUTO, "performance_longrun", CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_RW,
-		&crusoe_performance_longrun, 0, tmx86_longrun_profile_sysctl, "I", "");
+	    OID_AUTO, "performance_longrun",
+	    CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_RW | CTLFLAG_NEEDGIANT,
+	    &crusoe_performance_longrun, 0, tmx86_longrun_profile_sysctl, "I",
+	    "");
 	SYSCTL_ADD_PROC(&crusoe_sysctl_ctx, SYSCTL_CHILDREN(crusoe_sysctl_tree),
-		OID_AUTO, "economy_longrun", CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_RW,
-		&crusoe_economy_longrun, 0, tmx86_longrun_profile_sysctl, "I", "");
+	    OID_AUTO, "economy_longrun",
+	    CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_RW | CTLFLAG_NEEDGIANT,
+	    &crusoe_economy_longrun, 0, tmx86_longrun_profile_sysctl, "I", "");
 
 	/* register performance profile change handler */
 	EVENTHANDLER_REGISTER(power_profile_change, tmx86_longrun_power_profile, NULL, 0);
diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index 7e5018e58b499..169aec1330c5e 100644
--- a/sys/i386/i386/machdep.c
+++ b/sys/i386/i386/machdep.c
@@ -2666,8 +2666,10 @@ smap_sysctl_handler(SYSCTL_HANDLER_ARGS)
 	}
 	return (error);
 }
-SYSCTL_PROC(_machdep, OID_AUTO, smap, CTLTYPE_OPAQUE|CTLFLAG_RD, NULL, 0,
-    smap_sysctl_handler, "S,bios_smap_xattr", "Raw BIOS SMAP data");
+SYSCTL_PROC(_machdep, OID_AUTO, smap,
+    CTLTYPE_OPAQUE | CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, 0,
+    smap_sysctl_handler, "S,bios_smap_xattr",
+    "Raw BIOS SMAP data");
 
 void
 spinlock_enter(void)
diff --git a/sys/i386/i386/mp_clock.c b/sys/i386/i386/mp_clock.c
index cc0f315ed65c9..153d4691f1903 100644
--- a/sys/i386/i386/mp_clock.c
+++ b/sys/i386/i386/mp_clock.c
@@ -81,8 +81,10 @@ sysctl_machdep_piix_freq(SYSCTL_HANDLER_ARGS)
 	return (error);
 }
 
-SYSCTL_PROC(_machdep, OID_AUTO, piix_freq, CTLTYPE_INT | CTLFLAG_RW,
-    0, sizeof(u_int), sysctl_machdep_piix_freq, "I", "");
+SYSCTL_PROC(_machdep, OID_AUTO, piix_freq,
+    CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, 0, sizeof(u_int),
+    sysctl_machdep_piix_freq, "I",
+    "");
 
 static unsigned
 piix_get_timecount(struct timecounter *tc)
diff --git a/sys/i386/i386/pmap_base.c b/sys/i386/i386/pmap_base.c
index c0a2e859db407..af6964ae19751 100644
--- a/sys/i386/i386/pmap_base.c
+++ b/sys/i386/i386/pmap_base.c
@@ -107,7 +107,8 @@ __FBSDID("$FreeBSD$");
 #endif
 #include <x86/ifunc.h>
 
-static SYSCTL_NODE(_vm, OID_AUTO, pmap, CTLFLAG_RD, 0, "VM/pmap parameters");
+static SYSCTL_NODE(_vm, OID_AUTO, pmap, CTLFLAG_RD | CTLFLAG_MPSAFE, 0,
+    "VM/pmap parameters");
 
 #include <machine/vmparam.h>
 #include <vm/vm.h>
@@ -164,7 +165,7 @@ SYSCTL_INT(_vm_pmap, OID_AUTO, shpgperproc, CTLFLAG_RD,
     &shpgperproc, 0,
     "Page share factor per proc");
 
-static SYSCTL_NODE(_vm_pmap, OID_AUTO, pde, CTLFLAG_RD, 0,
+static SYSCTL_NODE(_vm_pmap, OID_AUTO, pde, CTLFLAG_RD | CTLFLAG_MPSAFE, 0,
     "2/4MB page mapping counters");
 
 u_long pmap_pde_demotions;
diff --git a/sys/i386/i386/prof_machdep.c b/sys/i386/i386/prof_machdep.c
index 9c71f49f14fec..55bf5d3da8922 100644
--- a/sys/i386/i386/prof_machdep.c
+++ b/sys/i386/i386/prof_machdep.c
@@ -300,8 +300,10 @@ sysctl_machdep_cputime_clock(SYSCTL_HANDLER_ARGS)
 	return (error);
 }
 
-SYSCTL_PROC(_machdep, OID_AUTO, cputime_clock, CTLTYPE_INT | CTLFLAG_RW,
-	    0, sizeof(u_int), sysctl_machdep_cputime_clock, "I", "");
+SYSCTL_PROC(_machdep, OID_AUTO, cputime_clock,
+    CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, 0, sizeof(u_int),
+    sysctl_machdep_cputime_clock, "I",
+    "");
 
 /*
  * The start and stop routines need not be here since we turn off profiling