[src/netbsd-1-5]: src/sys/arch/alpha/common Pull up rev. 1.40:

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/28e2deb34874
branches:  netbsd-1-5
changeset: 488566:28e2deb34874
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Tue Jul 18 06:24:20 2000 +0000

description:
Pull up rev. 1.40:
When computing the segment size, consider the maximum segment
size in the DMA map.

diffstat:

 sys/arch/alpha/common/bus_dma.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (27 lines):

diff -r 5402359218cb -r 28e2deb34874 sys/arch/alpha/common/bus_dma.c
--- a/sys/arch/alpha/common/bus_dma.c   Tue Jul 18 06:22:39 2000 +0000
+++ b/sys/arch/alpha/common/bus_dma.c   Tue Jul 18 06:24:20 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.36.4.1 2000/06/30 16:27:13 simonb Exp $ */
+/* $NetBSD: bus_dma.c,v 1.36.4.2 2000/07/18 06:24:20 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.36.4.1 2000/06/30 16:27:13 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.36.4.2 2000/07/18 06:24:20 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -182,6 +182,8 @@
                sgsize = NBPG - ((u_long)vaddr & PGOFSET);
                if (buflen < sgsize)
                        sgsize = buflen;
+               if (map->_dm_maxsegsz < sgsize)
+                       sgsize = map->_dm_maxsegsz;
 
                /*
                 * Make sure we don't cross any boundaries.