Merge branch 'master' into gfio

[fio.git] / fio.1

diff --git a/fio.1 b/fio.1
index b7abc4b6f97f639e024b470b721598084ed2447b..62c42c61c911f4549a6f2e57520e140d4fd865b7 100644 (file)
--- a/fio.1
+++ b/fio.1
@@ -1120,6 +1120,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.