From owner-svn-src-user@FreeBSD.ORG  Sat Jul 11 01:47:34 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D6A07106564A;
	Sat, 11 Jul 2009 01:47:34 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C534E8FC0A;
	Sat, 11 Jul 2009 01:47:34 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n6B1lYQq038378;
	Sat, 11 Jul 2009 01:47:34 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n6B1lYGN038376;
	Sat, 11 Jul 2009 01:47:34 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200907110147.n6B1lYGN038376@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Sat, 11 Jul 2009 01:47:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r195602 - user/kmacy/releng_7_2_fcs_1/sys/amd64/amd64
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 11 Jul 2009 01:47:35 -0000

Author: kmacy
Date: Sat Jul 11 01:47:34 2009
New Revision: 195602
URL: http://svn.freebsd.org/changeset/base/195602

Log:
  - mask out excluded pages
  - shift page count such that MB are printed

Modified:
  user/kmacy/releng_7_2_fcs_1/sys/amd64/amd64/minidump_machdep.c

Modified: user/kmacy/releng_7_2_fcs_1/sys/amd64/amd64/minidump_machdep.c
==============================================================================
--- user/kmacy/releng_7_2_fcs_1/sys/amd64/amd64/minidump_machdep.c	Sat Jul 11 00:32:26 2009	(r195601)
+++ user/kmacy/releng_7_2_fcs_1/sys/amd64/amd64/minidump_machdep.c	Sat Jul 11 01:47:34 2009	(r195602)
@@ -375,13 +375,13 @@ minidumpsys(struct dumperinfo *di)
 	printf("\nclustering memory chunks\n");
 	for (pages_written = i = 0;
 	     i < vm_page_dump_size / sizeof(*vm_page_dump); i++) {
-		bits = vm_page_dump[i];
+		bits = vm_page_dump[i] & ~(vm_page_dump_exclude[i]);
 		while (bits) {
 			bit = bsfq(bits);
 			pa = (((uint64_t)i * sizeof(*vm_page_dump) * NBBY) + bit) * PAGE_SIZE;
 			pages_written++;
 			if (pages_written && (pages_written % 1024) == 0)
-				printf("%dMB ", pages_written*PAGE_SIZE);
+				printf("%dMB ", (pages_written >> 8));
 			error = blk_write(di, 0, pa, PAGE_SIZE);
 			if (error)
 				goto fail;