summaryrefslogtreecommitdiffstats
path: root/usr.bin/systat/vmstat.c
diff options
context:
space:
mode:
authormikeb <mikeb@openbsd.org>2010-11-19 18:35:16 +0000
committermikeb <mikeb@openbsd.org>2010-11-19 18:35:16 +0000
commit6dfb0ca93bf7f3b016787f81e551441d5bbd5575 (patch)
tree21431a3724e45e2a9d014c08c6ae647ad36cb213 /usr.bin/systat/vmstat.c
parentgapz@dud-t . org noted that sparc64 installboot crashes if the bootblock is (diff)
downloadwireguard-openbsd-6dfb0ca93bf7f3b016787f81e551441d5bbd5575.tar.xz
wireguard-openbsd-6dfb0ca93bf7f3b016787f81e551441d5bbd5575.zip
Make KERN_CPTIME return an avarage number of ticks across all CPUs
tedu agreed with an idea, tested by Luis Useche and me; ok deraadt
Diffstat (limited to 'usr.bin/systat/vmstat.c')
-rw-r--r--usr.bin/systat/vmstat.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/usr.bin/systat/vmstat.c b/usr.bin/systat/vmstat.c
index 47ed8641f75..a7025edab5c 100644
--- a/usr.bin/systat/vmstat.c
+++ b/usr.bin/systat/vmstat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vmstat.c,v 1.72 2009/10/27 23:59:44 deraadt Exp $ */
+/* $OpenBSD: vmstat.c,v 1.73 2010/11/19 18:35:16 mikeb Exp $ */
/* $NetBSD: vmstat.c,v 1.5 1996/05/10 23:16:40 thorpej Exp $ */
/*-
@@ -159,8 +159,6 @@ field_view views_vm[] = {
{NULL, NULL, 0, NULL}
};
-int ncpu = 1;
-
int
initvmstat(void)
{
@@ -168,13 +166,7 @@ initvmstat(void)
int mib[4], i;
size_t size;
- mib[0] = CTL_HW;
- mib[1] = HW_NCPU;
- size = sizeof(ncpu);
- if (sysctl(mib, 2, &ncpu, &size, NULL, 0) < 0)
- return (-1);
-
- hertz = stathz ? stathz : hz;
+ hertz = stathz;
if (!dkinit(1))
return(0);
@@ -343,7 +335,6 @@ showkre(void)
}
failcnt = 0;
etime /= hertz;
- etime /= ncpu;
inttotal = 0;
for (i = 0; i < nintr; i++) {
if (s.intrcnt[i] == 0)