From owner-p4-projects@FreeBSD.ORG  Fri Jul 23 01:58:56 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4D7B116A4D0; Fri, 23 Jul 2004 01:58:56 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 26B8F16A4CE
	for <perforce@freebsd.org>; Fri, 23 Jul 2004 01:58:56 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1F4E543D4C
	for <perforce@freebsd.org>; Fri, 23 Jul 2004 01:58:56 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6N1wuo5023521
	for <perforce@freebsd.org>; Fri, 23 Jul 2004 01:58:56 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6N1wtSo023518
	for perforce@freebsd.org; Fri, 23 Jul 2004 01:58:55 GMT
	(envelope-from peter@freebsd.org)
Date: Fri, 23 Jul 2004 01:58:55 GMT
Message-Id: <200407230158.i6N1wtSo023518@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 57961 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Jul 2004 01:58:57 -0000

http://perforce.freebsd.org/chv.cgi?CH=57961

Change 57961 by peter@peter_melody on 2004/07/23 01:58:10

	integ -I -b i386_hammer

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#14 integrate
.. //depot/projects/hammer/sys/amd64/amd64/db_trace.c#18 integrate
.. //depot/projects/hammer/sys/amd64/amd64/pmap.c#96 integrate
.. //depot/projects/hammer/sys/amd64/conf/NOTES#37 integrate

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#14 (text+ko) ====

@@ -526,7 +526,7 @@
 
 	if ((dmat->lowaddr < ptoa((vm_paddr_t)Maxmem)
 	 || dmat->boundary > 0 || dmat->alignment > 1)
-	 && map->pagesneeded == 0) {
+	 && map != &nobounce_dmamap && map->pagesneeded == 0) {
 		vm_offset_t	vendaddr;
 
 		/*

==== //depot/projects/hammer/sys/amd64/amd64/db_trace.c#18 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#96 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/conf/NOTES#37 (text+ko) ====

@@ -4,7 +4,7 @@
 # This file contains machine dependent kernel configuration notes.  For
 # machine independent notes, look in /sys/conf/NOTES.
 #
-# (XXX from i386:NOTES,v 1.1165)
+# (XXX from i386:NOTES,v 1.1166)
 # $FreeBSD: src/sys/amd64/conf/NOTES,v 1.14 2004/05/17 22:13:14 peter Exp $
 #