===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/vmstat/vmstat.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -c -r1.110 -r1.111
*** src/usr.bin/vmstat/vmstat.c	2008/09/08 09:06:25	1.110
--- src/usr.bin/vmstat/vmstat.c	2008/10/08 17:47:28	1.111
***************
*** 1,5 ****
  /*	$NetBSD: vmstat.c,v 1.29.4.1 1996/06/05 00:21:05 cgd Exp $	*/
! /*	$OpenBSD: vmstat.c,v 1.110 2008/09/08 09:06:25 otto Exp $	*/
  
  /*
   * Copyright (c) 1980, 1986, 1991, 1993
--- 1,5 ----
  /*	$NetBSD: vmstat.c,v 1.29.4.1 1996/06/05 00:21:05 cgd Exp $	*/
! /*	$OpenBSD: vmstat.c,v 1.111 2008/10/08 17:47:28 deraadt Exp $	*/
  
  /*
   * Copyright (c) 1980, 1986, 1991, 1993
***************
*** 40,46 ****
  #if 0
  static char sccsid[] = "@(#)vmstat.c	8.1 (Berkeley) 6/6/93";
  #else
! static const char rcsid[] = "$OpenBSD: vmstat.c,v 1.110 2008/09/08 09:06:25 otto Exp $";
  #endif
  #endif /* not lint */
  
--- 40,46 ----
  #if 0
  static char sccsid[] = "@(#)vmstat.c	8.1 (Berkeley) 6/6/93";
  #else
! static const char rcsid[] = "$OpenBSD: vmstat.c,v 1.111 2008/10/08 17:47:28 deraadt Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 406,412 ****
  		}
  		(void)printf("%2u%2u%2u",
  		    total.t_rq - 1, total.t_dw + total.t_pw, total.t_sw);
! #define	rate(x)	(((x) + halfuptime) / uptime)	/* round */
  #define pgtok(a) ((a) * ((unsigned int)uvmexp.pagesize >> 10))
  		(void)printf("%7u %7u ",
  		    pgtok(total.t_avm), pgtok(total.t_free));
--- 406,412 ----
  		}
  		(void)printf("%2u%2u%2u",
  		    total.t_rq - 1, total.t_dw + total.t_pw, total.t_sw);
! #define	rate(x)	((((unsigned)x) + halfuptime) / uptime)	/* round */
  #define pgtok(a) ((a) * ((unsigned int)uvmexp.pagesize >> 10))
  		(void)printf("%7u %7u ",
  		    pgtok(total.t_avm), pgtok(total.t_free));