diff options
author | Mark Johnston <markj@FreeBSD.org> | 2015-09-11 03:00:20 +0000 |
---|---|---|
committer | Mark Johnston <markj@FreeBSD.org> | 2015-09-11 03:00:20 +0000 |
commit | d73ce4c6986e10c39ad4dfc4f2261e3ad5f17ead (patch) | |
tree | 57c6e51431d30911758d6357a8afe77ca5692790 /sys | |
parent | ad8d57a99d35d61205feaba653b5b5c90d58fdd6 (diff) |
Notes
Diffstat (limited to 'sys')
-rw-r--r-- | sys/sys/vmmeter.h | 3 | ||||
-rw-r--r-- | sys/vm/vm_meter.c | 6 | ||||
-rw-r--r-- | sys/vm/vm_page.c | 1 | ||||
-rw-r--r-- | sys/vm/vm_param.h | 4 |
4 files changed, 3 insertions, 11 deletions
diff --git a/sys/sys/vmmeter.h b/sys/sys/vmmeter.h index 92d7cc60f5b6..4d3df294d4aa 100644 --- a/sys/sys/vmmeter.h +++ b/sys/sys/vmmeter.h @@ -97,8 +97,6 @@ struct vmmeter { u_int v_inactive_target; /* (c) pages desired inactive */ u_int v_inactive_count; /* (q) pages inactive */ u_int v_cache_count; /* (f) pages on cache queue */ - u_int v_cache_min; /* (c) min pages desired on cache queue */ - u_int v_cache_max; /* (c) max pages in cached obj (unused) */ u_int v_pageout_free_min; /* (c) min pages reserved for kernel */ u_int v_interrupt_free_min; /* (c) reserved pages for int code */ u_int v_free_severe; /* (c) severe page depletion point */ @@ -113,6 +111,7 @@ struct vmmeter { u_int v_vforkpages; /* (p) VM pages affected by vfork() */ u_int v_rforkpages; /* (p) VM pages affected by rfork() */ u_int v_kthreadpages; /* (p) VM pages affected by fork() by kernel */ + u_int v_spare[2]; }; #ifdef _KERNEL diff --git a/sys/vm/vm_meter.c b/sys/vm/vm_meter.c index 865be71a96fa..f1573a3dc706 100644 --- a/sys/vm/vm_meter.c +++ b/sys/vm/vm_meter.c @@ -63,10 +63,6 @@ SYSCTL_UINT(_vm, VM_V_FREE_RESERVED, v_free_reserved, CTLFLAG_RW, &vm_cnt.v_free_reserved, 0, "Pages reserved for deadlock"); SYSCTL_UINT(_vm, VM_V_INACTIVE_TARGET, v_inactive_target, CTLFLAG_RW, &vm_cnt.v_inactive_target, 0, "Pages desired inactive"); -SYSCTL_UINT(_vm, VM_V_CACHE_MIN, v_cache_min, - CTLFLAG_RW, &vm_cnt.v_cache_min, 0, "Min pages on cache queue"); -SYSCTL_UINT(_vm, VM_V_CACHE_MAX, v_cache_max, - CTLFLAG_RW, &vm_cnt.v_cache_max, 0, "Max pages on cache queue"); SYSCTL_UINT(_vm, VM_V_PAGEOUT_FREE_MIN, v_pageout_free_min, CTLFLAG_RW, &vm_cnt.v_pageout_free_min, 0, "Min pages reserved for kernel"); SYSCTL_UINT(_vm, OID_AUTO, v_free_severe, @@ -308,8 +304,6 @@ VM_STATS_VM(v_active_count, "Active pages"); VM_STATS_VM(v_inactive_target, "Desired inactive pages"); VM_STATS_VM(v_inactive_count, "Inactive pages"); VM_STATS_VM(v_cache_count, "Pages on cache queue"); -VM_STATS_VM(v_cache_min, "Min pages on cache queue"); -VM_STATS_VM(v_cache_max, "Max pages on cached queue"); VM_STATS_VM(v_pageout_free_min, "Min pages reserved for kernel"); VM_STATS_VM(v_interrupt_free_min, "Reserved pages for interrupt code"); VM_STATS_VM(v_forks, "Number of fork() calls"); diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index c7bc7072c8c0..9c4890f2c303 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -3290,7 +3290,6 @@ DB_SHOW_COMMAND(page, vm_page_print_page_info) db_printf("vm_cnt.v_free_reserved: %d\n", vm_cnt.v_free_reserved); db_printf("vm_cnt.v_free_min: %d\n", vm_cnt.v_free_min); db_printf("vm_cnt.v_free_target: %d\n", vm_cnt.v_free_target); - db_printf("vm_cnt.v_cache_min: %d\n", vm_cnt.v_cache_min); db_printf("vm_cnt.v_inactive_target: %d\n", vm_cnt.v_inactive_target); } diff --git a/sys/vm/vm_param.h b/sys/vm/vm_param.h index 38456de320f9..68e5cd1f1332 100644 --- a/sys/vm/vm_param.h +++ b/sys/vm/vm_param.h @@ -79,8 +79,8 @@ #define VM_V_FREE_TARGET 4 /* vm_cnt.v_free_target */ #define VM_V_FREE_RESERVED 5 /* vm_cnt.v_free_reserved */ #define VM_V_INACTIVE_TARGET 6 /* vm_cnt.v_inactive_target */ -#define VM_V_CACHE_MIN 7 /* vm_cnt.v_cache_min */ -#define VM_V_CACHE_MAX 8 /* vm_cnt.v_cache_max */ +#define VM_OBSOLETE_7 7 /* unused, formerly v_cache_min */ +#define VM_OBSOLETE_8 8 /* unused, formerly v_cache_max */ #define VM_V_PAGEOUT_FREE_MIN 9 /* vm_cnt.v_pageout_free_min */ #define VM_OBSOLETE_10 10 /* pageout algorithm */ #define VM_SWAPPING_ENABLED 11 /* swapping enabled */ |