From owner-svn-src-head@FreeBSD.ORG  Wed Jan 12 21:08:50 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 54A3E106564A;
	Wed, 12 Jan 2011 21:08:50 +0000 (UTC) (envelope-from mdf@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4009F8FC0C;
	Wed, 12 Jan 2011 21:08:50 +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 p0CL8oYl012040;
	Wed, 12 Jan 2011 21:08:50 GMT (envelope-from mdf@svn.freebsd.org)
Received: (from mdf@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0CL8o3Q012038;
	Wed, 12 Jan 2011 21:08:50 GMT (envelope-from mdf@svn.freebsd.org)
Message-Id: <201101122108.p0CL8o3Q012038@svn.freebsd.org>
From: Matthew D Fleming <mdf@FreeBSD.org>
Date: Wed, 12 Jan 2011 21:08:50 +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: r217330 - head/sys/x86/x86
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 12 Jan 2011 21:08:50 -0000

Author: mdf
Date: Wed Jan 12 21:08:49 2011
New Revision: 217330
URL: http://svn.freebsd.org/changeset/base/217330

Log:
  Fix a brain fart.  Since this file is shared between i386 and amd64, a
  bus_size_t may be 32 or 64 bits.  Change the bounce_zone alignment field
  to explicitly be 32 bits, as I can't really imagine a DMA device that
  needs anything close to 2GB alignment of data.

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

Modified: head/sys/x86/x86/busdma_machdep.c
==============================================================================
--- head/sys/x86/x86/busdma_machdep.c	Wed Jan 12 20:44:11 2011	(r217329)
+++ head/sys/x86/x86/busdma_machdep.c	Wed Jan 12 21:08:49 2011	(r217330)
@@ -100,7 +100,7 @@ struct bounce_zone {
 	int		total_bounced;
 	int		total_deferred;
 	int		map_count;
-	bus_size_t	alignment;
+	uint32_t	alignment;
 	bus_addr_t	lowaddr;
 	char		zoneid[8];
 	char		lowaddrid[20];
@@ -1060,9 +1060,9 @@ alloc_bounce_zone(bus_dma_tag_t dmat)
 	SYSCTL_ADD_STRING(busdma_sysctl_tree(bz),
 	    SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO,
 	    "lowaddr", CTLFLAG_RD, bz->lowaddrid, 0, "");
-	SYSCTL_ADD_UQUAD(busdma_sysctl_tree(bz),
+	SYSCTL_ADD_UINT(busdma_sysctl_tree(bz),
 	    SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO,
-	    "alignment", CTLFLAG_RD, &bz->alignment, "");
+	    "alignment", CTLFLAG_RD, &bz->alignment, 0, "");
 
 	return (0);
 }