svn commit: r199734 - in head/sys: dev/xen/blkfront i386/xen

[Kip Macy]

Author: kmacy
Date: Tue Nov 24 07:17:51 2009
New Revision: 199734
URL: http://svn.freebsd.org/changeset/base/199734

Log:
  fixup kernel core dumps on paravirtual guests

Modified:
  head/sys/dev/xen/blkfront/blkfront.c
  head/sys/i386/xen/pmap.c

Modified: head/sys/dev/xen/blkfront/blkfront.c
==============================================================================
--- head/sys/dev/xen/blkfront/blkfront.c	Tue Nov 24 03:38:42 2009	(r199733)
+++ head/sys/dev/xen/blkfront/blkfront.c	Tue Nov 24 07:17:51 2009	(r199734)
@@ -325,7 +325,7 @@ xb_quiesce(struct blkfront_info *info)
 		}
 		if (blkif_queued_requests) {
 			// Still pending requests, wait for the disk i/o to complete
-			HYPERVISOR_block();
+			HYPERVISOR_yield();
 		}
 	}
 }

Modified: head/sys/i386/xen/pmap.c
==============================================================================
--- head/sys/i386/xen/pmap.c	Tue Nov 24 03:38:42 2009	(r199733)
+++ head/sys/i386/xen/pmap.c	Tue Nov 24 07:17:51 2009	(r199734)
@@ -3103,7 +3103,7 @@ pmap_kenter_temporary(vm_paddr_t pa, int
 	vm_offset_t va;
 
 	va = (vm_offset_t)crashdumpmap + (i * PAGE_SIZE);
-	pmap_kenter(va, pa);
+	PT_SET_MA(va, (pa & ~PAGE_MASK) | PG_V | pgeflag);
 	invlpg(va);
 	return ((void *)crashdumpmap);
 }