diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-10-13 09:58:23 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-10-13 09:58:23 -0400 |
| commit | ebf8889bd1fe3615991ff4494635d237280652a2 (patch) | |
| tree | 10fb735717122bbb86474339eac07f26e7ccdf40 /Documentation/DMA-API.txt | |
| parent | b160292cc216a50fd0cd386b0bda2cd48352c73b (diff) | |
| parent | 752097cec53eea111d087c545179b421e2bde98a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'Documentation/DMA-API.txt')
| -rw-r--r-- | Documentation/DMA-API.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/DMA-API.txt b/Documentation/DMA-API.txt index cc7a8c39fb6f..b939ebb62871 100644 --- a/Documentation/DMA-API.txt +++ b/Documentation/DMA-API.txt | |||
| @@ -68,6 +68,9 @@ size and dma_handle must all be the same as those passed into the | |||
| 68 | consistent allocate. cpu_addr must be the virtual address returned by | 68 | consistent allocate. cpu_addr must be the virtual address returned by |
| 69 | the consistent allocate. | 69 | the consistent allocate. |
| 70 | 70 | ||
| 71 | Note that unlike their sibling allocation calls, these routines | ||
| 72 | may only be called with IRQs enabled. | ||
| 73 | |||
| 71 | 74 | ||
| 72 | Part Ib - Using small dma-coherent buffers | 75 | Part Ib - Using small dma-coherent buffers |
| 73 | ------------------------------------------ | 76 | ------------------------------------------ |