svn commit: r187408 - in stable/7/sys: . amd64/amd64 contrib/pf dev/ath/ath_hal dev/cxgb

[Alan Cox]

Author: alc
Date: Sun Jan 18 19:56:13 2009
New Revision: 187408
URL: http://svn.freebsd.org/changeset/base/187408

Log:
  MFC rev 179898
    Make preparations for increasing the size of the kernel virtual
    address space on the amd64 architecture.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/amd64/amd64/minidump_machdep.c
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)

Modified: stable/7/sys/amd64/amd64/minidump_machdep.c
==============================================================================
--- stable/7/sys/amd64/amd64/minidump_machdep.c	Sun Jan 18 19:37:36 2009	(r187407)
+++ stable/7/sys/amd64/amd64/minidump_machdep.c	Sun Jan 18 19:56:13 2009	(r187408)
@@ -202,7 +202,7 @@ minidumpsys(struct dumperinfo *di)
 	/* Walk page table pages, set bits in vm_page_dump */
 	ptesize = 0;
 	pdp = (uint64_t *)PHYS_TO_DMAP(KPDPphys);
-	for (va = KERNBASE; va < kernel_vm_end; va += NBPDR) {
+	for (va = VM_MIN_KERNEL_ADDRESS; va < kernel_vm_end; va += NBPDR) {
 		i = (va >> PDPSHIFT) & ((1ul << NPDPEPGSHIFT) - 1);
 		/*
 		 * We always write a page, even if it is zero. Each
@@ -274,7 +274,7 @@ minidumpsys(struct dumperinfo *di)
 	mdhdr.msgbufsize = msgbufp->msg_size;
 	mdhdr.bitmapsize = vm_page_dump_size;
 	mdhdr.ptesize = ptesize;
-	mdhdr.kernbase = KERNBASE;
+	mdhdr.kernbase = VM_MIN_KERNEL_ADDRESS;
 	mdhdr.dmapbase = DMAP_MIN_ADDRESS;
 	mdhdr.dmapend = DMAP_MAX_ADDRESS;
 
@@ -308,7 +308,7 @@ minidumpsys(struct dumperinfo *di)
 
 	/* Dump kernel page table pages */
 	pdp = (uint64_t *)PHYS_TO_DMAP(KPDPphys);
-	for (va = KERNBASE; va < kernel_vm_end; va += NBPDR) {
+	for (va = VM_MIN_KERNEL_ADDRESS; va < kernel_vm_end; va += NBPDR) {
 		i = (va >> PDPSHIFT) & ((1ul << NPDPEPGSHIFT) - 1);
 		/* We always write a page, even if it is zero */
 		if ((pdp[i] & PG_V) == 0) {