From owner-svn-src-all@FreeBSD.ORG  Tue Nov 24 07:17:52 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 11659106568B;
	Tue, 24 Nov 2009 07:17:52 +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 002078FC1C;
	Tue, 24 Nov 2009 07:17:51 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nAO7HpNV008838;
	Tue, 24 Nov 2009 07:17:51 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAO7Hp2u008835;
	Tue, 24 Nov 2009 07:17:51 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200911240717.nAO7Hp2u008835@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Tue, 24 Nov 2009 07:17:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r199734 - in head/sys: dev/xen/blkfront i386/xen
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Nov 2009 07:17:52 -0000

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);
 }