diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-12-16 20:57:41 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-12-16 20:57:41 +0100 |
commit | dd7a5230cd651bfb119d222561c4032f30dd5659 (patch) | |
tree | 85628ef75d1f512f43df6f760980b6cce6cf40c7 /Documentation/DMA-API.txt | |
parent | x86: remove duplicate #define from 'cpufeature.h' (diff) | |
parent | Linux 2.6.28-rc8 (diff) | |
download | linux-dd7a5230cd651bfb119d222561c4032f30dd5659.tar.xz linux-dd7a5230cd651bfb119d222561c4032f30dd5659.zip |
Merge commit 'v2.6.28-rc8' into x86/cpufeature
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). pci_map_sg(struct pci_dev *hwdev, struct scatterlist *sg, int nents, int direction) -Maps a scatter gather list from the block layer. - Returns: the number of physical segments mapped (this may be shorter -than <nents> passed in if the block layer determines that some -elements of the scatter/gather list are physically adjacent and thus -may be mapped with a single entry). +than <nents> passed in if some elements of the scatter/gather list are +physically or virtually adjacent and an IOMMU maps them with a single +entry). Please note that the sg cannot be mapped again if it has been mapped once. The mapping process is allowed to destroy information in the sg. |