summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkib <kib@FreeBSD.org>2016-05-22 23:28:23 +0000
committerkib <kib@FreeBSD.org>2016-05-22 23:28:23 +0000
commit359a9397836436cfa9d00eafcc8e54af71328f1c (patch)
tree196b78d0371c25f8b1ae4f4edd5d6c1fd51e8d82
parentea08516c978faca21f64b28823c2cc405a252636 (diff)
downloadFreeBSD-src-359a9397836436cfa9d00eafcc8e54af71328f1c.zip
FreeBSD-src-359a9397836436cfa9d00eafcc8e54af71328f1c.tar.gz
Mark swap-related proc sysctls as not requiring Giant.
Reviewed by: alc (as part of larger patch) Sponsored by: The FreeBSD Foundation
-rw-r--r--sys/vm/swap_pager.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c
index 751a6fa..db1a2c4 100644
--- a/sys/vm/swap_pager.c
+++ b/sys/vm/swap_pager.c
@@ -325,8 +325,9 @@ static int nsw_wcount_async_max;/* assigned maximum */
static int nsw_cluster_max; /* maximum VOP I/O allowed */
static int sysctl_swap_async_max(SYSCTL_HANDLER_ARGS);
-SYSCTL_PROC(_vm, OID_AUTO, swap_async_max, CTLTYPE_INT | CTLFLAG_RW,
- NULL, 0, sysctl_swap_async_max, "I", "Maximum running async swap ops");
+SYSCTL_PROC(_vm, OID_AUTO, swap_async_max, CTLTYPE_INT | CTLFLAG_RW |
+ CTLFLAG_MPSAFE, NULL, 0, sysctl_swap_async_max, "I",
+ "Maximum running async swap ops");
static struct swblock **swhash;
static int swhash_mask;
@@ -2356,7 +2357,8 @@ sysctl_vm_swap_info(SYSCTL_HANDLER_ARGS)
SYSCTL_INT(_vm, OID_AUTO, nswapdev, CTLFLAG_RD, &nswapdev, 0,
"Number of swap devices");
-SYSCTL_NODE(_vm, OID_AUTO, swap_info, CTLFLAG_RD, sysctl_vm_swap_info,
+SYSCTL_NODE(_vm, OID_AUTO, swap_info, CTLFLAG_RD | CTLFLAG_MPSAFE,
+ sysctl_vm_swap_info,
"Swap statistics by device");
/*
OpenPOWER on IntegriCloud