From owner-p4-projects@FreeBSD.ORG  Tue Sep 30 19:04:26 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1B8A4106573F; Tue, 30 Sep 2008 19:04:25 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 35FE81065695
	for <perforce@freebsd.org>; Tue, 30 Sep 2008 19:04:25 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 251748FC21
	for <perforce@freebsd.org>; Tue, 30 Sep 2008 19:04:25 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8UJ4O1w017371
	for <perforce@freebsd.org>; Tue, 30 Sep 2008 19:04:24 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8UJ4O1j017365
	for perforce@freebsd.org; Tue, 30 Sep 2008 19:04:24 GMT
	(envelope-from jhb@freebsd.org)
Date: Tue, 30 Sep 2008 19:04:24 GMT
Message-Id: <200809301904.m8UJ4O1j017365@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 150718 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Tue, 30 Sep 2008 19:04:26 -0000

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

Change 150718 by jhb@jhb_mutex on 2008/09/30 19:04:15

	IFC @150716

Affected files ...

.. //depot/projects/smpng/sys/dev/fatm/if_fatm.c#20 integrate

Differences ...

==== //depot/projects/smpng/sys/dev/fatm/if_fatm.c#20 (text+ko) ====

@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/fatm/if_fatm.c,v 1.24 2008/03/25 09:38:57 ru Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/fatm/if_fatm.c,v 1.25 2008/09/30 18:52:43 marius Exp $");
 
 #include "opt_inet.h"
 #include "opt_natm.h"
@@ -2880,7 +2880,7 @@
 	 * restrictions for the controller (and PCI bus) and is never used
 	 * to do anything.
 	 */
-	if (bus_dma_tag_create(NULL, 1, 0,
+	if (bus_dma_tag_create(bus_get_dma_tag(dev), 1, 0,
 	    BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR,
 	    NULL, NULL, BUS_SPACE_MAXSIZE_32BIT, MAXDMASEGS,
 	    BUS_SPACE_MAXSIZE_32BIT, 0, NULL, NULL,