33c33
< __FBSDID("$FreeBSD: head/sys/vm/vm_meter.c 248084 2013-03-09 02:32:23Z attilio $");
---
> __FBSDID("$FreeBSD: head/sys/vm/vm_meter.c 263620 2014-03-22 10:26:09Z bdrewery $");
56c56
< struct vmmeter cnt;
---
> struct vmmeter vm_cnt;
59c59
< CTLFLAG_RW, &cnt.v_free_min, 0, "Minimum low-free-pages threshold");
---
> CTLFLAG_RW, &vm_cnt.v_free_min, 0, "Minimum low-free-pages threshold");
61c61
< CTLFLAG_RW, &cnt.v_free_target, 0, "Desired free pages");
---
> CTLFLAG_RW, &vm_cnt.v_free_target, 0, "Desired free pages");
63c63
< CTLFLAG_RW, &cnt.v_free_reserved, 0, "Pages reserved for deadlock");
---
> CTLFLAG_RW, &vm_cnt.v_free_reserved, 0, "Pages reserved for deadlock");
65c65
< CTLFLAG_RW, &cnt.v_inactive_target, 0, "Pages desired inactive");
---
> CTLFLAG_RW, &vm_cnt.v_inactive_target, 0, "Pages desired inactive");
67c67
< CTLFLAG_RW, &cnt.v_cache_min, 0, "Min pages on cache queue");
---
> CTLFLAG_RW, &vm_cnt.v_cache_min, 0, "Min pages on cache queue");
69c69
< CTLFLAG_RW, &cnt.v_cache_max, 0, "Max pages on cache queue");
---
> CTLFLAG_RW, &vm_cnt.v_cache_max, 0, "Max pages on cache queue");
71c71
< CTLFLAG_RW, &cnt.v_pageout_free_min, 0, "Min pages reserved for kernel");
---
> CTLFLAG_RW, &vm_cnt.v_pageout_free_min, 0, "Min pages reserved for kernel");
73c73
< CTLFLAG_RW, &cnt.v_free_severe, 0, "Severe page depletion point");
---
> CTLFLAG_RW, &vm_cnt.v_free_severe, 0, "Severe page depletion point");
234c234
< total.t_free = cnt.v_free_count + cnt.v_cache_count;
---
> total.t_free = vm_cnt.v_free_count + vm_cnt.v_cache_count;
254c254
< int offset = (char *)arg1 - (char *)&cnt;
---
> int offset = (char *)arg1 - (char *)&vm_cnt;
276c276
< CTLTYPE_UINT | CTLFLAG_RD | CTLFLAG_MPSAFE, &cnt.var, 0, vcnt, \
---
> CTLTYPE_UINT | CTLFLAG_RD | CTLFLAG_MPSAFE, &vm_cnt.var, 0, vcnt, \