From owner-svn-src-all@FreeBSD.ORG  Wed Dec  8 19:52:05 2010
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 28295106566B;
	Wed,  8 Dec 2010 19:52:05 +0000 (UTC)
	(envelope-from cperciva@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 176D48FC13;
	Wed,  8 Dec 2010 19:52:05 +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 oB8Jq4E8013200;
	Wed, 8 Dec 2010 19:52:04 GMT (envelope-from cperciva@svn.freebsd.org)
Received: (from cperciva@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oB8Jq4mV013198;
	Wed, 8 Dec 2010 19:52:04 GMT (envelope-from cperciva@svn.freebsd.org)
Message-Id: <201012081952.oB8Jq4mV013198@svn.freebsd.org>
From: Colin Percival <cperciva@FreeBSD.org>
Date: Wed, 8 Dec 2010 19:52:04 +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: r216306 - head/sys/amd64/amd64
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: Wed, 08 Dec 2010 19:52:05 -0000

Author: cperciva
Date: Wed Dec  8 19:52:04 2010
New Revision: 216306
URL: http://svn.freebsd.org/changeset/base/216306

Log:
  MFi386 r1.94: If XEN, make pmap_kextract = pmap_kextract_ma.  This is a
  no-op currently, since FreeBSD/amd64 doesn't have (paravirtualized) Xen
  support, but if/when that support is ever added we'll want this, and
  until then it's harmless.

Modified:
  head/sys/amd64/amd64/busdma_machdep.c

Modified: head/sys/amd64/amd64/busdma_machdep.c
==============================================================================
--- head/sys/amd64/amd64/busdma_machdep.c	Wed Dec  8 19:48:29 2010	(r216305)
+++ head/sys/amd64/amd64/busdma_machdep.c	Wed Dec  8 19:52:04 2010	(r216306)
@@ -141,6 +141,11 @@ int run_filter(bus_dma_tag_t dmat, bus_a
 int _bus_dmamap_count_pages(bus_dma_tag_t dmat, bus_dmamap_t map, pmap_t pmap,
     void *buf, bus_size_t buflen, int flags);
 
+#ifdef XEN
+#undef pmap_kextract
+#define pmap_kextract pmap_kextract_ma
+#endif
+
 /*
  * Return true if a match is made.
  *