===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/vmstat/dkstats.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -c -r1.26 -r1.27
*** src/usr.bin/vmstat/dkstats.c	2005/07/04 01:54:10	1.26
--- src/usr.bin/vmstat/dkstats.c	2005/10/17 19:04:20	1.27
***************
*** 1,4 ****
! /*	$OpenBSD: dkstats.c,v 1.26 2005/07/04 01:54:10 djm Exp $	*/
  /*	$NetBSD: dkstats.c,v 1.1 1996/05/10 23:19:27 thorpej Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: dkstats.c,v 1.27 2005/10/17 19:04:20 otto Exp $	*/
  /*	$NetBSD: dkstats.c,v 1.1 1996/05/10 23:19:27 thorpej Exp $	*/
  
  /*
***************
*** 382,388 ****
  			cur.dk_rbytes[i] = cur_disk.dk_rbytes;
  			cur.dk_wbytes[i] = cur_disk.dk_wbytes;
  			timerset(&(cur_disk.dk_time), &(cur.dk_time[i]));
! 			p = cur_disk.dk_link.tqe_next;
  		}
  		deref_nl(X_CP_TIME, cur.cp_time, sizeof(cur.cp_time));
  		deref_nl(X_TK_NIN, &cur.tk_nin, sizeof(cur.tk_nin));
--- 382,388 ----
  			cur.dk_rbytes[i] = cur_disk.dk_rbytes;
  			cur.dk_wbytes[i] = cur_disk.dk_wbytes;
  			timerset(&(cur_disk.dk_time), &(cur.dk_time[i]));
! 			p = TAILQ_NEXT(&cur_disk, dk_link);
  		}
  		deref_nl(X_CP_TIME, cur.cp_time, sizeof(cur.cp_time));
  		deref_nl(X_TK_NIN, &cur.tk_nin, sizeof(cur.tk_nin));
***************
*** 443,449 ****
  
  		/* Get a pointer to the first disk. */
  		deref_nl(X_DISKLIST, &disk_head, sizeof(disk_head));
! 		dk_drivehead = disk_head.tqh_first;
  
  		/* Get ticks per second. */
  		deref_nl(X_STATHZ, &hz, sizeof(hz));
--- 443,449 ----
  
  		/* Get a pointer to the first disk. */
  		deref_nl(X_DISKLIST, &disk_head, sizeof(disk_head));
! 		dk_drivehead = TAILQ_FIRST(&disk_head);
  
  		/* Get ticks per second. */
  		deref_nl(X_STATHZ, &hz, sizeof(hz));
***************
*** 528,534 ****
  				errx(1, "Memory allocation failure.");
  			cur.dk_select[i] = select;
  
! 			p = cur_disk.dk_link.tqe_next;
  		}
  #endif /* !defined(NOKVM) */
  	}
--- 528,534 ----
  				errx(1, "Memory allocation failure.");
  			cur.dk_select[i] = select;
  
! 			p = TAILQ_NEXT(&cur_disk, dk_link);
  		}
  #endif /* !defined(NOKVM) */
  	}