diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-19 22:57:06 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-19 22:57:06 -0400 |
| commit | 865be78022e9ae8151c755d01201012ccf5e3232 (patch) | |
| tree | 02bd16c51db03ff6ebf379bc99a2d45acdaad271 /tools | |
| parent | 41f1830f5a7af77cf5c86359aba3cbd706687e52 (diff) | |
| parent | 88931ec3dc11e7dbceb3b0df455693873b508fbe (diff) | |
Merge tag 'ntb-4.12-bugfixes' of git://github.com/jonmason/ntb
Pull NTB fixes from Jon Mason:
"NTB bug fixes to address the modinfo in ntb_perf, a couple of bugs in
the NTB transport QP calculations, skx doorbells, and sleeping in
ntb_async_tx_submit"
* tag 'ntb-4.12-bugfixes' of git://github.com/jonmason/ntb:
ntb: no sleep in ntb_async_tx_submit
ntb: ntb_hw_intel: Skylake doorbells should be 32bits, not 64bits
ntb_transport: fix bug calculating num_qps_mw
ntb_transport: fix qp count bug
NTB: ntb_test: fix bug printing ntb_perf results
ntb: Correct modinfo usage statement for ntb_perf
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/testing/selftests/ntb/ntb_test.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/selftests/ntb/ntb_test.sh b/tools/testing/selftests/ntb/ntb_test.sh index a676d3eefefb..13f5198ba0ee 100755 --- a/tools/testing/selftests/ntb/ntb_test.sh +++ b/tools/testing/selftests/ntb/ntb_test.sh | |||
| @@ -305,7 +305,7 @@ function perf_test() | |||
| 305 | echo "Running remote perf test $WITH DMA" | 305 | echo "Running remote perf test $WITH DMA" |
| 306 | write_file "" $REMOTE_PERF/run | 306 | write_file "" $REMOTE_PERF/run |
| 307 | echo -n " " | 307 | echo -n " " |
| 308 | read_file $LOCAL_PERF/run | 308 | read_file $REMOTE_PERF/run |
| 309 | echo " Passed" | 309 | echo " Passed" |
| 310 | 310 | ||
| 311 | _modprobe -r ntb_perf | 311 | _modprobe -r ntb_perf |