===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/systat/vmstat.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- src/usr.bin/systat/vmstat.c	2018/05/03 07:49:18	1.83
+++ src/usr.bin/systat/vmstat.c	2018/05/14 12:31:21	1.84
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vmstat.c,v 1.83 2018/05/03 07:49:18 otto Exp $	*/
+/*	$OpenBSD: vmstat.c,v 1.84 2018/05/14 12:31:21 mpi Exp $	*/
 /*	$NetBSD: vmstat.c,v 1.5 1996/05/10 23:16:40 thorpej Exp $	*/
 
 /*-
@@ -268,7 +268,7 @@
 	mvprintw(GENSTATROW, GENSTATCOL, "   Csw   Trp   Sys   Int   Sof  Flt");
 
 	mvprintw(GRAPHROW, GRAPHCOL,
-	    "    . %%Int    . %%Sys    . %%Usr    . %%Nic    . %%Idle");
+	    "    . %%Int    . %%Sys    . %%Usr    . %%Spn    . %%Idle");
 	mvprintw(PROCSROW, PROCSCOL, "Proc:r  d  s  w");
 	mvprintw(GRAPHROW + 1, GRAPHCOL,
 	    "|    |    |    |    |    |    |    |    |    |    |");
@@ -306,8 +306,8 @@
 	} while (0)
 #define MAXFAIL 5
 
-static	char cpuchar[CPUSTATES] = { '|', '=', '>', '-', ' ' };
-static	char cpuorder[CPUSTATES] = { CP_INTR, CP_SYS, CP_USER, CP_NICE, CP_IDLE };
+static	char cpuchar[] = { '|', '=', '>', '-', ' ' };
+static	char cpuorder[] = { CP_INTR, CP_SYS, CP_USER, CP_SPIN, CP_IDLE };
 
 void
 showkre(void)
@@ -367,7 +367,7 @@
 	psiz = 0;
 	f2 = 0.0;
 
-	for (c = 0; c < CPUSTATES; c++) {
+	for (c = 0; c < nitems(cpuorder); c++) {
 		i = cpuorder[c];
 		f1 = cputime(i);
 		f2 += f1;