Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 7 insertions, 3 deletions

diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c
index 45bf04eb7d70..a94445422cc6 100644
--- a/arch/ia64/hp/common/sba_iommu.c
+++ b/arch/ia64/hp/common/sba_iommu.c
@@ -1265,7 +1265,7 @@ sba_fill_pdir(
  * the sglist do both.
  */
 static SBA_INLINE int
-sba_coalesce_chunks( struct ioc *ioc,
+sba_coalesce_chunks(struct ioc *ioc, struct device *dev,
         struct scatterlist *startsg,
         int nents)
 {
@@ -1275,6 +1275,7 @@ sba_coalesce_chunks( struct ioc *ioc,
         struct scatterlist *dma_sg;        /* next DMA stream head */
         unsigned long dma_offset, dma_len; /* start/len of DMA stream */
         int n_mappings = 0;
+        unsigned int max_seg_size = dma_get_max_seg_size(dev);
 
         while (nents > 0) {
                 unsigned long vaddr = (unsigned long) sba_sg_address(startsg);
@@ -1314,6 +1315,9 @@ sba_coalesce_chunks( struct ioc *ioc,
                             > DMA_CHUNK_SIZE)
                                 break;
 
+                        if (dma_len + startsg->length > max_seg_size)
+                                break;
+
                         /*
                         ** Then look for virtually contiguous blocks.
                         **
@@ -1441,7 +1445,7 @@ int sba_map_sg(struct device *dev, struct scatterlist *sglist, int nents, int di
         ** w/o this association, we wouldn't have coherent DMA!
         ** Access to the virtual address is what forces a two pass algorithm.
         */
-        coalesced = sba_coalesce_chunks(ioc, sglist, nents);
+        coalesced = sba_coalesce_chunks(ioc, dev, sglist, nents);
 
         /*
         ** Program the I/O Pdir
@@ -1871,7 +1875,7 @@ ioc_show(struct seq_file *s, void *v)
         return 0;
 }
 
-static struct seq_operations ioc_seq_ops = {
+static const struct seq_operations ioc_seq_ops = {
         .start = ioc_start,
         .next  = ioc_next,
         .stop  = ioc_stop,