From c6b359eea01fd25c4b19d8b3215b6deb6701097d Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori Date: Mon, 1 Dec 2008 13:14:01 -0800 Subject: [PATCH] --- yaml --- r: 119533 b: refs/heads/master c: 1d678f365dae28420fa7329a2a35390b3582678d h: refs/heads/master i: 119531: 1d7e9464f5c96ca61f776ed66c04e8dcd4022a5c v: v3 --- [refs] | 2 +- trunk/Documentation/DMA-API.txt | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 58e3d37d8e26..9c6490788393 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4280e3126f641898f0ed1a931645373d3489e2a6 +refs/heads/master: 1d678f365dae28420fa7329a2a35390b3582678d diff --git a/trunk/Documentation/DMA-API.txt b/trunk/Documentation/DMA-API.txt index b8e86460046e..b462bb149543 100644 --- a/trunk/Documentation/DMA-API.txt +++ b/trunk/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 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 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.