From 9fd0669542fe966d8e025ca5cabf2a230b34935b Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Tue, 12 Apr 2005 23:15:28 +0000 Subject: [PATCH] Tidy vcnt() by moving a duplicated line above #ifdef and removing a useless variable. --- sys/vm/vm_meter.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sys/vm/vm_meter.c b/sys/vm/vm_meter.c index b9c1f505a54..ac2906aa310 100644 --- a/sys/vm/vm_meter.c +++ b/sys/vm/vm_meter.c @@ -255,22 +255,19 @@ vmtotal(SYSCTL_HANDLER_ARGS) static int vcnt(SYSCTL_HANDLER_ARGS) { - int error = 0; int count = *(int *)arg1; + int offset = (char *)arg1 - (char *)&cnt; #ifdef SMP int i; - int offset = (char *)arg1 - (char *)&cnt; for (i = 0; i < mp_ncpus; ++i) { struct pcpu *pcpu = pcpu_find(i); count += *(int *)((char *)&pcpu->pc_cnt + offset); } #else - int offset = (char *)arg1 - (char *)&cnt; count += *(int *)((char *)PCPU_PTR(cnt) + offset); #endif - error = SYSCTL_OUT(req, &count, sizeof(int)); - return(error); + return (SYSCTL_OUT(req, &count, sizeof(int))); } SYSCTL_PROC(_vm, VM_TOTAL, vmtotal, CTLTYPE_OPAQUE|CTLFLAG_RD,