aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Baldwin <jhb@FreeBSD.org>2005-04-12 23:15:28 +0000
committerJohn Baldwin <jhb@FreeBSD.org>2005-04-12 23:15:28 +0000
commit9fd0669542fe966d8e025ca5cabf2a230b34935b (patch)
tree519a2fa1029712d1ffad3973f154fc676f7e38ca
parentae3676c4e2a1d293e659ea7b768576745e01a5c8 (diff)
Tidy vcnt() by moving a duplicated line above #ifdef and removing a useless
variable.
Notes
svn path=/head/; revision=144970
-rw-r--r--sys/vm/vm_meter.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/sys/vm/vm_meter.c b/sys/vm/vm_meter.c
index b9c1f505a543..ac2906aa3103 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,