Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba1c28a9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'sg' of git://git.kernel.dk/linux-2.6-block 

* 'sg' of git://git.kernel.dk/linux-2.6-block:
  sparc64: zero out dma_length
  fvr32: fixup dma-mapping for new sg layout
  sh/sh64: fixup dma-mapping for new sg layout
  Fix sctp compile
  m68knommu: remove sg_address()
  frv: update comment in scatterlist to reflect new setup
  blackfin: remove sg_address()
  arm: sg fallout
  mips: sg_page() fallout
  alpha: sg_virt() fallout
  intel-iommu: fix sg_page()
  parisc: fix sg_page() fallout
  ide: build fix
  net: fix xfrm build - missing scatterlist.h include
  [BLOCK] blk_rq_map_sg: force clear termination bit
  [BLOCK] Don't clear sg_dma_len/addr() in blk_rq_map_sg()
  s390 zfcp: sg fixups
  powerpc: Fix fallout from sg_page() changes
  IB/ehca: Fix sg_page() fallout
  arm: build fix
parents 101e4d91 cb92ae81

arch/alpha/kernel/pci_iommu.c

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include <linux/pci.h>

#include <linux/slab.h>

#include <linux/bootmem.h>

#include <linux/scatterlist.h>

#include <linux/log2.h>



#include <asm/io.h>

arch/arm/common/dmabounce.c

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <linux/dma-mapping.h>

#include <linux/dmapool.h>

#include <linux/list.h>

#include <linux/scatterlist.h>



#include <asm/cacheflush.h>

arch/mips/mm/dma-default.c

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/mm.h>

#include <linux/module.h>

#include <linux/string.h>

#include <linux/scatterlist.h>



#include <asm/cache.h>

#include <asm/io.h>

arch/parisc/kernel/pci-dma.c

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/slab.h>

#include <linux/string.h>

#include <linux/types.h>

#include <linux/scatterlist.h>



#include <asm/cacheflush.h>

#include <asm/dma.h>    /* for DMA_CHUNK_SIZE */

arch/sparc64/kernel/iommu_common.c

+5 −0
Original line number Diff line number Diff line
@@ -233,6 +233,11 @@ unsigned long prepare_sg(struct scatterlist *sg, int nents) 
	dma_sg->dma_address = dent_addr;

	dma_sg->dma_length = dent_len;



	if (dma_sg != sg) {

		dma_sg = next_sg(dma_sg);

		dma_sg->dma_length = 0;

	}



	return ((unsigned long) dent_addr +

		(unsigned long) dent_len +

		(IO_PAGE_SIZE - 1UL)) >> IO_PAGE_SHIFT;