From owner-svn-src-all@FreeBSD.ORG  Wed Dec  8 20:20:11 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 2DCAB106564A;
	Wed,  8 Dec 2010 20:20:11 +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 1CCA78FC12;
	Wed,  8 Dec 2010 20:20:11 +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 oB8KKBMU013853;
	Wed, 8 Dec 2010 20:20:11 GMT (envelope-from cperciva@svn.freebsd.org)
Received: (from cperciva@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oB8KKA7V013850;
	Wed, 8 Dec 2010 20:20:10 GMT (envelope-from cperciva@svn.freebsd.org)
Message-Id: <201012082020.oB8KKA7V013850@svn.freebsd.org>
From: Colin Percival <cperciva@FreeBSD.org>
Date: Wed, 8 Dec 2010 20:20:10 +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: r216308 - in head/sys: amd64/amd64 i386/i386
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 20:20:11 -0000

Author: cperciva
Date: Wed Dec  8 20:20:10 2010
New Revision: 216308
URL: http://svn.freebsd.org/changeset/base/216308

Log:
  On amd64, we have (since r1.72, in December 2005) MAX_BPAGES=8192,
  while on i386 we have MAX_BPAGES=512.  Implement this difference via
  '#ifdef __i386__'.
  
  With this commit, the i386 and amd64 busdma_machdep.c files become
  identical; they will soon be replaced by a single file under sys/x86.

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

Modified: head/sys/amd64/amd64/busdma_machdep.c
==============================================================================
--- head/sys/amd64/amd64/busdma_machdep.c	Wed Dec  8 19:59:53 2010	(r216307)
+++ head/sys/amd64/amd64/busdma_machdep.c	Wed Dec  8 20:20:10 2010	(r216308)
@@ -50,7 +50,11 @@ __FBSDID("$FreeBSD$");
 #include <machine/md_var.h>
 #include <machine/specialreg.h>
 
+#ifdef __i386__
+#define MAX_BPAGES 512
+#else
 #define MAX_BPAGES 8192
+#endif
 #define BUS_DMA_COULD_BOUNCE	BUS_DMA_BUS3
 #define BUS_DMA_MIN_ALLOC_COMP	BUS_DMA_BUS4
 

Modified: head/sys/i386/i386/busdma_machdep.c
==============================================================================
--- head/sys/i386/i386/busdma_machdep.c	Wed Dec  8 19:59:53 2010	(r216307)
+++ head/sys/i386/i386/busdma_machdep.c	Wed Dec  8 20:20:10 2010	(r216308)
@@ -50,7 +50,11 @@ __FBSDID("$FreeBSD$");
 #include <machine/md_var.h>
 #include <machine/specialreg.h>
 
+#ifdef __i386__
 #define MAX_BPAGES 512
+#else
+#define MAX_BPAGES 8192
+#endif
 #define BUS_DMA_COULD_BOUNCE	BUS_DMA_BUS3
 #define BUS_DMA_MIN_ALLOC_COMP	BUS_DMA_BUS4