Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 9 Jan 2016 01:43:53 +0000 (UTC)
From:      Mark Johnston <markj@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-user@freebsd.org
Subject:   svn commit: r293457 - user/alc/PQ_LAUNDRY/usr.bin/vmstat
Message-ID:  <201601090143.u091hrqg067050@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: markj
Date: Sat Jan  9 01:43:53 2016
New Revision: 293457
URL: https://svnweb.freebsd.org/changeset/base/293457

Log:
  Fix a mismerge.

Modified:
  user/alc/PQ_LAUNDRY/usr.bin/vmstat/vmstat.c

Modified: user/alc/PQ_LAUNDRY/usr.bin/vmstat/vmstat.c
==============================================================================
--- user/alc/PQ_LAUNDRY/usr.bin/vmstat/vmstat.c	Sat Jan  9 01:42:31 2016	(r293456)
+++ user/alc/PQ_LAUNDRY/usr.bin/vmstat/vmstat.c	Sat Jan  9 01:43:53 2016	(r293457)
@@ -1094,8 +1094,8 @@ dosum(void)
 		sum.v_active_count);
 	xo_emit("{:inactive-pages/%9u} {N:pages inactive}\n",
 		sum.v_inactive_count);
-	xo_emit("{:vm-laundry-pages/%9u} {N:pages in the laundry queue}\n",
-		sum.v_cache_count);
+	xo_emit("{:laundry-pages/%9u} {N:pages in the laundry queue}\n",
+		sum.v_laundry_count);
 	xo_emit("{:wired-pages/%9u} {N:pages wired down}\n",
 		sum.v_wire_count);
 	xo_emit("{:free-pages/%9u} {N:pages free}\n",



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601090143.u091hrqg067050>