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);
 }
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to