aboutsummaryrefslogtreecommitdiff
path: root/sys/vm/memguard.c
diff options
context:
space:
mode:
authorHans Petter Selasky <hselasky@FreeBSD.org>2014-06-28 03:56:17 +0000
committerHans Petter Selasky <hselasky@FreeBSD.org>2014-06-28 03:56:17 +0000
commitaf3b2549c4ba2ef00a7cbb4cb6836598bf0aefbe (patch)
tree2ebc46d89e79d747fa284f379b1979658216c719 /sys/vm/memguard.c
parentb152235544f6d8515906c119c210fbd77827b511 (diff)
downloadsrc-af3b2549c4ba2ef00a7cbb4cb6836598bf0aefbe.tar.gz
src-af3b2549c4ba2ef00a7cbb4cb6836598bf0aefbe.zip
Pull in r267961 and r267973 again. Fix for issues reported will follow.
Notes
Notes: svn path=/head/; revision=267992
Diffstat (limited to 'sys/vm/memguard.c')
-rw-r--r--sys/vm/memguard.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/vm/memguard.c b/sys/vm/memguard.c
index 1d3b4125a149..d502ca569bde 100644
--- a/sys/vm/memguard.c
+++ b/sys/vm/memguard.c
@@ -67,7 +67,7 @@ static SYSCTL_NODE(_vm, OID_AUTO, memguard, CTLFLAG_RW, NULL, "MemGuard data");
* reserved for MemGuard.
*/
static u_int vm_memguard_divisor;
-SYSCTL_UINT(_vm_memguard, OID_AUTO, divisor, CTLFLAG_RDTUN,
+SYSCTL_UINT(_vm_memguard, OID_AUTO, divisor, CTLFLAG_RDTUN | CTLFLAG_NOFETCH,
&vm_memguard_divisor,
0, "(kmem_size/memguard_divisor) == memguard submap size");
@@ -132,8 +132,7 @@ SYSCTL_ULONG(_vm_memguard, OID_AUTO, fail_pgs, CTLFLAG_RD,
#define MG_GUARD_ALLLARGE 0x002
#define MG_GUARD_NOFREE 0x004
static int memguard_options = MG_GUARD_AROUND;
-TUNABLE_INT("vm.memguard.options", &memguard_options);
-SYSCTL_INT(_vm_memguard, OID_AUTO, options, CTLFLAG_RW,
+SYSCTL_INT(_vm_memguard, OID_AUTO, options, CTLFLAG_RWTUN,
&memguard_options, 0,
"MemGuard options:\n"
"\t0x001 - add guard pages around each allocation\n"
@@ -149,8 +148,7 @@ SYSCTL_ULONG(_vm_memguard, OID_AUTO, minsize_reject, CTLFLAG_RD,
static u_int memguard_frequency;
static u_long memguard_frequency_hits;
-TUNABLE_INT("vm.memguard.frequency", &memguard_frequency);
-SYSCTL_UINT(_vm_memguard, OID_AUTO, frequency, CTLFLAG_RW,
+SYSCTL_UINT(_vm_memguard, OID_AUTO, frequency, CTLFLAG_RWTUN,
&memguard_frequency, 0, "Times in 100000 that MemGuard will randomly run");
SYSCTL_ULONG(_vm_memguard, OID_AUTO, frequency_hits, CTLFLAG_RD,
&memguard_frequency_hits, 0, "# times MemGuard randomly chose");