diff options
| author | hselasky <hselasky@FreeBSD.org> | 2014-10-27 14:38:00 +0000 |
|---|---|---|
| committer | hselasky <hselasky@FreeBSD.org> | 2014-10-27 14:38:00 +0000 |
| commit | 1f41d295fba2d409098181fe1212b0bbad862311 (patch) | |
| tree | ba2736123ed8400baf0cb45744b440c6e0eb456d /sys/vm | |
| parent | a3704ff4d46f150fc2e004a6f0f75c57047b967c (diff) | |
| download | FreeBSD-src-1f41d295fba2d409098181fe1212b0bbad862311.zip FreeBSD-src-1f41d295fba2d409098181fe1212b0bbad862311.tar.gz | |
MFC r263710, r273377, r273378, r273423 and r273455:
- De-vnet hash sizes and hash masks.
- Fix multiple issues related to arguments passed to SYSCTL macros.
Sponsored by: Mellanox Technologies
Diffstat (limited to 'sys/vm')
| -rw-r--r-- | sys/vm/memguard.c | 4 | ||||
| -rw-r--r-- | sys/vm/vm_kern.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/vm/memguard.c b/sys/vm/memguard.c index 167c223..19b199d 100644 --- a/sys/vm/memguard.c +++ b/sys/vm/memguard.c @@ -228,9 +228,9 @@ memguard_sysinit(void) parent = SYSCTL_STATIC_CHILDREN(_vm_memguard); - SYSCTL_ADD_ULONG(NULL, parent, OID_AUTO, "mapstart", CTLFLAG_RD, + SYSCTL_ADD_UAUTO(NULL, parent, OID_AUTO, "mapstart", CTLFLAG_RD, &memguard_base, "MemGuard KVA base"); - SYSCTL_ADD_ULONG(NULL, parent, OID_AUTO, "maplimit", CTLFLAG_RD, + SYSCTL_ADD_UAUTO(NULL, parent, OID_AUTO, "maplimit", CTLFLAG_RD, &memguard_mapsize, "MemGuard KVA size"); #if 0 SYSCTL_ADD_ULONG(NULL, parent, OID_AUTO, "mapused", CTLFLAG_RD, diff --git a/sys/vm/vm_kern.c b/sys/vm/vm_kern.c index 4dfb7f5..2ea1346 100644 --- a/sys/vm/vm_kern.c +++ b/sys/vm/vm_kern.c @@ -95,13 +95,13 @@ const void *zero_region; CTASSERT((ZERO_REGION_SIZE & PAGE_MASK) == 0); SYSCTL_ULONG(_vm, OID_AUTO, min_kernel_address, CTLFLAG_RD, - NULL, VM_MIN_KERNEL_ADDRESS, "Min kernel address"); + SYSCTL_NULL_ULONG_PTR, VM_MIN_KERNEL_ADDRESS, "Min kernel address"); SYSCTL_ULONG(_vm, OID_AUTO, max_kernel_address, CTLFLAG_RD, #if defined(__arm__) || defined(__sparc64__) &vm_max_kernel_address, 0, #else - NULL, VM_MAX_KERNEL_ADDRESS, + SYSCTL_NULL_ULONG_PTR, VM_MAX_KERNEL_ADDRESS, #endif "Max kernel address"); |
