summaryrefslogtreecommitdiffstats
path: root/Documentation/block/queue-sysfs.txt
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2017-01-12 16:10:00 +0800
committerHerbert Xu <herbert@gondor.apana.org.au>2017-01-12 16:10:00 +0800
commit4cf0662888026d5c1b62ed3fa8dc048a2ff2e124 (patch)
treea5c92c5024c599a00bfd8d402d2b7b0a619b0259 /Documentation/block/queue-sysfs.txt
parentc821f6ab2e47946f35ee2f30781c5185e5d07f65 (diff)
parenta121103c922847ba5010819a3f250f1f7fc84ab8 (diff)
downloadop-kernel-dev-4cf0662888026d5c1b62ed3fa8dc048a2ff2e124.zip
op-kernel-dev-4cf0662888026d5c1b62ed3fa8dc048a2ff2e124.tar.gz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Merging 4.10-rc3 so that the cryptodev tree builds on ARM64.
Diffstat (limited to 'Documentation/block/queue-sysfs.txt')
-rw-r--r--Documentation/block/queue-sysfs.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/block/queue-sysfs.txt b/Documentation/block/queue-sysfs.txt
index 5164215..c0a3bb5 100644
--- a/Documentation/block/queue-sysfs.txt
+++ b/Documentation/block/queue-sysfs.txt
@@ -54,9 +54,9 @@ This is the hardware sector size of the device, in bytes.
io_poll (RW)
------------
-When read, this file shows the total number of block IO polls and how
-many returned success. Writing '0' to this file will disable polling
-for this device. Writing any non-zero value will enable this feature.
+When read, this file shows whether polling is enabled (1) or disabled
+(0). Writing '0' to this file will disable polling for this device.
+Writing any non-zero value will enable this feature.
io_poll_delay (RW)
------------------
OpenPOWER on IntegriCloud