diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-13 04:12:51 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-13 04:12:51 -0500 |
commit | 72aaf09fda49f5919d98d65d35e5179f3acb0497 (patch) | |
tree | 5fd25748f7f5640f8ee8efb86ddca88d12840791 /Documentation/DMA-API.txt | |
parent | 67fbc2312312095acc2f19a0b601bac10f84cf9d (diff) | |
parent | 58c2467355ed3154a12ee49d8f8236547145c9d3 (diff) |
Merge git://git.marvell.com/orion into devel
Diffstat (limited to 'Documentation/DMA-API.txt')
-rw-r--r-- | Documentation/DMA-API.txt | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Documentation/DMA-API.txt b/Documentation/DMA-API.txt index b8e86460046e..b462bb149543 100644 --- a/Documentation/DMA-API.txt +++ b/Documentation/DMA-API.txt | |||
@@ -316,12 +316,10 @@ reduce current DMA mapping usage or delay and try again later). | |||
316 | pci_map_sg(struct pci_dev *hwdev, struct scatterlist *sg, | 316 | pci_map_sg(struct pci_dev *hwdev, struct scatterlist *sg, |
317 | int nents, int direction) | 317 | int nents, int direction) |
318 | 318 | ||
319 | Maps a scatter gather list from the block layer. | ||
320 | |||
321 | Returns: the number of physical segments mapped (this may be shorter | 319 | Returns: the number of physical segments mapped (this may be shorter |
322 | than <nents> passed in if the block layer determines that some | 320 | than <nents> passed in if some elements of the scatter/gather list are |
323 | elements of the scatter/gather list are physically adjacent and thus | 321 | physically or virtually adjacent and an IOMMU maps them with a single |
324 | may be mapped with a single entry). | 322 | entry). |
325 | 323 | ||
326 | Please note that the sg cannot be mapped again if it has been mapped once. | 324 | Please note that the sg cannot be mapped again if it has been mapped once. |
327 | The mapping process is allowed to destroy information in the sg. | 325 | The mapping process is allowed to destroy information in the sg. |