projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
parisc
/
iommu-helpers.h
diff --git
a/drivers/parisc/iommu-helpers.h
b/drivers/parisc/iommu-helpers.h
index 97ba8286c5969285294c2dd886a0e375071f4878..a9c46cc2db3701157485b8194af83a6c03c7b189 100644
(file)
--- a/
drivers/parisc/iommu-helpers.h
+++ b/
drivers/parisc/iommu-helpers.h
@@
-96,8
+96,8
@@
iommu_fill_pdir(struct ioc *ioc, struct scatterlist *startsg, int nents,
static inline unsigned int
iommu_coalesce_chunks(struct ioc *ioc, struct device *dev,
static inline unsigned int
iommu_coalesce_chunks(struct ioc *ioc, struct device *dev,
-
struct scatterlist *startsg, int nents,
-
int (*iommu_alloc_range)(struct ioc
*, size_t))
+ struct scatterlist *startsg, int nents,
+
int (*iommu_alloc_range)(struct ioc *, struct device
*, size_t))
{
struct scatterlist *contig_sg; /* contig chunk head */
unsigned long dma_offset, dma_len; /* start/len of DMA stream */
{
struct scatterlist *contig_sg; /* contig chunk head */
unsigned long dma_offset, dma_len; /* start/len of DMA stream */
@@
-166,7
+166,7
@@
iommu_coalesce_chunks(struct ioc *ioc, struct device *dev,
dma_len = ALIGN(dma_len + dma_offset, IOVP_SIZE);
sg_dma_address(contig_sg) =
PIDE_FLAG
dma_len = ALIGN(dma_len + dma_offset, IOVP_SIZE);
sg_dma_address(contig_sg) =
PIDE_FLAG
- | (iommu_alloc_range(ioc, dma_len) << IOVP_SHIFT)
+ | (iommu_alloc_range(ioc, d
ev, d
ma_len) << IOVP_SHIFT)
| dma_offset;
n_mappings++;
}
| dma_offset;
n_mappings++;
}