Merge branch 'master' into gfio

[fio.git] / fio.1

diff --git a/fio.1 b/fio.1
index c22d8b28490e6f694ed051f095c2ff6670bf5ff4..3c0002cc1a946e2dab60d3289939eafed9e4ec73 100644 (file)
--- a/fio.1
+++ b/fio.1
@@ -1031,6 +1031,12 @@ Some parameters are only valid when a specific ioengine is in use. These are
 used identically to normal parameters, with the caveat that when used on the
 command line, the must come after the ioengine that defines them is selected.
 .TP
+.BI (cpu)cpuload \fR=\fPint
+Attempt to use the specified percentage of CPU cycles.
+.TP
+.BI (cpu)cpuchunks \fR=\fPint
+Split the load into cycles of the given time. In microseconds.
+.TP
 .BI (libaio)userspace_reap
 Normally, with the libaio engine in use, fio will use
 the io_getevents system call to reap newly returned events.