From 0283f98333f828e9c49b5b9e2a4403dac4b44135 Mon Sep 17 00:00:00 2001
From: dsl <dsl@NetBSD.org>
Date: Sun, 5 Feb 2006 09:58:39 +0000
Subject: [PATCH] Match changes to vmstat.c (splitting of dkreadstats). Read
 tape stats if there are no disks found - is this possible?

---
 usr.bin/systat/iostat.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/usr.bin/systat/iostat.c b/usr.bin/systat/iostat.c
index d1d87e6045a5..10b68ffb000f 100644
--- a/usr.bin/systat/iostat.c
+++ b/usr.bin/systat/iostat.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: iostat.c,v 1.33 2005/08/07 12:32:38 blymn Exp $	*/
+/*	$NetBSD: iostat.c,v 1.34 2006/02/05 09:58:39 dsl Exp $	*/
 
 /*
  * Copyright (c) 1980, 1992, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)iostat.c	8.1 (Berkeley) 6/6/93";
 #endif
-__RCSID("$NetBSD: iostat.c,v 1.33 2005/08/07 12:32:38 blymn Exp $");
+__RCSID("$NetBSD: iostat.c,v 1.34 2006/02/05 09:58:39 dsl Exp $");
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -84,6 +84,7 @@ initiostat(void)
 
 	dkinit(1);
 	tpinit(1);
+	cpureadstats();
 	dkreadstats();
 	tpreadstats();
 	return(1);
@@ -93,14 +94,12 @@ void
 fetchiostat(void)
 {
 
-	if (dk_ndrive == 0)
-		return;
-	else
+	cpureadstats();
+
+	if (dk_ndrive != 0)
 		dkreadstats();
 
-	if (tp_ndrive == 0)
-		return;
-	else
+	if (tp_ndrive != 0)
 		tpreadstats();
 }
 
@@ -235,6 +234,7 @@ showiostat(void)
 	if (dk_ndrive == 0)
 		return;
 	dkswap();
+	cpuswap();
 	tpswap();
 
 	etime = cur.cp_etime;