svn commit: r195602 - user/kmacy/releng_7_2_fcs_1/sys/amd64/amd64

[Kip Macy]

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;