diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-30 12:23:30 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-30 12:23:30 -0500 |
| commit | c43e0e46adf79c321ed3fbf0351e1005fb8a2413 (patch) | |
| tree | 35b9ab361651f649d3c9aa69f159812eba50d154 /Documentation/block/biodoc.txt | |
| parent | dba3d36b2f0842ed7f25c33cd3a2ccdb3d0df9db (diff) | |
| parent | f2257b70b0f9b2fe8f2afd83fc6798dca75930b8 (diff) | |
Merge branch 'linus' into core/percpu
Conflicts:
kernel/irq/handle.c
Diffstat (limited to 'Documentation/block/biodoc.txt')
| -rw-r--r-- | Documentation/block/biodoc.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/block/biodoc.txt b/Documentation/block/biodoc.txt index 3c5434c83daf..5d2480d33b43 100644 --- a/Documentation/block/biodoc.txt +++ b/Documentation/block/biodoc.txt | |||
| @@ -186,8 +186,9 @@ a virtual address mapping (unlike the earlier scheme of virtual address | |||
| 186 | do not have a corresponding kernel virtual address space mapping) and | 186 | do not have a corresponding kernel virtual address space mapping) and |
| 187 | low-memory pages. | 187 | low-memory pages. |
| 188 | 188 | ||
| 189 | Note: Please refer to DMA-mapping.txt for a discussion on PCI high mem DMA | 189 | Note: Please refer to Documentation/PCI/PCI-DMA-mapping.txt for a discussion |
| 190 | aspects and mapping of scatter gather lists, and support for 64 bit PCI. | 190 | on PCI high mem DMA aspects and mapping of scatter gather lists, and support |
| 191 | for 64 bit PCI. | ||
| 191 | 192 | ||
| 192 | Special handling is required only for cases where i/o needs to happen on | 193 | Special handling is required only for cases where i/o needs to happen on |
| 193 | pages at physical memory addresses beyond what the device can support. In these | 194 | pages at physical memory addresses beyond what the device can support. In these |