diff options
| author |   Jens Axboe <jens.axboe@oracle.com> | 2010-04-02 08:43:33 +0200 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2010-04-02 08:43:33 +0200 |
| commit | ed6b6dc7c142bfb5840d201a9b4a465c9e56ce33 (patch) | |
| tree | 538a3ec7ba62f5e668be7f0bd681857c1bd73da2 /Documentation | |
| parent | Linux 2.6.34-rc3 (diff) | |
| parent | Block: Fix block/elevator.c elevator_get() off-by-one error (diff) | |
| download | linux-dev-ed6b6dc7c142bfb5840d201a9b4a465c9e56ce33.tar.xz linux-dev-ed6b6dc7c142bfb5840d201a9b4a465c9e56ce33.zip | |
Merge branch 'for-linus' into for-2.6.35
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/DocBook/tracepoint.tmpl | 13 | ||||
| -rw-r--r-- | Documentation/block/biodoc.txt | 4 |
2 files changed, 15 insertions, 2 deletions
diff --git a/Documentation/DocBook/tracepoint.tmpl b/Documentation/DocBook/tracepoint.tmpl index 8bca1d5cec09..e8473eae2a20 100644 --- a/Documentation/DocBook/tracepoint.tmpl +++ b/Documentation/DocBook/tracepoint.tmpl @@ -16,6 +16,15 @@ </address> </affiliation> </author> + <author> + <firstname>William</firstname> + <surname>Cohen</surname> + <affiliation> + <address> + <email>wcohen@redhat.com</email> + </address> + </affiliation> + </author> </authorgroup> <legalnotice> @@ -91,4 +100,8 @@ !Iinclude/trace/events/signal.h </chapter> + <chapter id="block"> + <title>Block IO</title> +!Iinclude/trace/events/block.h + </chapter> </book> diff --git a/Documentation/block/biodoc.txt b/Documentation/block/biodoc.txt index 6fab97ea7e6b..508b5b2b0289 100644 --- a/Documentation/block/biodoc.txt +++ b/Documentation/block/biodoc.txt @@ -1162,8 +1162,8 @@ where a driver received a request ala this before: As mentioned, there is no virtual mapping of a bio. For DMA, this is not a problem as the driver probably never will need a virtual mapping. -Instead it needs a bus mapping (pci_map_page for a single segment or -use blk_rq_map_sg for scatter gather) to be able to ship it to the driver. For +Instead it needs a bus mapping (dma_map_page for a single segment or +use dma_map_sg for scatter gather) to be able to ship it to the driver. For PIO drivers (or drivers that need to revert to PIO transfer once in a while (IDE for example)), where the CPU is doing the actual data transfer a virtual mapping is needed. If the driver supports highmem I/O, |