diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-08 10:05:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-08 10:05:10 -0700 |
| commit | d7a39e300d0cea54379a7d92e11f2c8e5e5e2142 (patch) | |
| tree | 3561fdbff6a1ae2131745ae8b568888d6314b57a /Documentation | |
| parent | 14d0ee051753f30e23033bdb153110f00b03c8ce (diff) | |
| parent | bcc567e3115055a9cc256183d72864f01286be22 (diff) | |
| download | linux-stable-d7a39e300d0cea54379a7d92e11f2c8e5e5e2142.tar.gz linux-stable-d7a39e300d0cea54379a7d92e11f2c8e5e5e2142.tar.bz2 linux-stable-d7a39e300d0cea54379a7d92e11f2c8e5e5e2142.zip | |
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
Pull slave-dmaengine fixes from Vinod Koul:
"Fix from Andy is for dmatest regression reported by Will and Rabin has
fixed runtime ref counting for st_dma40"
* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
dmatest: do not allow to interrupt ongoing tests
dmaengine: ste_dma40: fix pm runtime ref counting
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/dmatest.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/dmatest.txt b/Documentation/dmatest.txt index 279ac0a8c5b1..132a094c7bc3 100644 --- a/Documentation/dmatest.txt +++ b/Documentation/dmatest.txt @@ -34,7 +34,7 @@ command: After a while you will start to get messages about current status or error like in the original code. -Note that running a new test will stop any in progress test. +Note that running a new test will not stop any in progress test. The following command should return actual state of the test. % cat /sys/kernel/debug/dmatest/run @@ -52,8 +52,8 @@ To wait for test done the user may perform a busy loop that checks the state. The module parameters that is supplied to the kernel command line will be used for the first performed test. After user gets a control, the test could be -interrupted or re-run with same or different parameters. For the details see -the above section "Part 2 - When dmatest is built as a module..." +re-run with the same or different parameters. For the details see the above +section "Part 2 - When dmatest is built as a module..." In both cases the module parameters are used as initial values for the test case. You always could check them at run-time by running |