From: Jens Axboe <axboe@kernel.dk>
Date: Tue, 10 Oct 2017 14:12:05 +0000 (-0600)
Subject: Merge branch 'pr/note-for-shmmax' of https://github.com/taghos/fio
X-Git-Tag: fio-3.2~50
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=41a8278a1bb21f523d2195c23faac4b8831678ba;hp=b18775f7b7c6c7d0a4d9b0a38e2a979e4180d14e;p=fio.git

Merge branch 'pr/note-for-shmmax' of https://github.com/taghos/fio
---

diff --git a/fio.1 b/fio.1
index 68ed3ba4..6e7d1f8b 100644
--- a/fio.1
+++ b/fio.1
@@ -113,6 +113,8 @@ All fio parser warnings are fatal, causing fio to exit with an error.
 .TP
 .BI \-\-max\-jobs \fR=\fPnr
 Set the maximum number of threads/processes to support to \fInr\fR.
+NOTE: On Linux, it may be necessary to increase the shared-memory limit
+(`/proc/sys/kernel/shmmax') if fio runs into errors while creating jobs.
 .TP
 .BI \-\-server \fR=\fPargs
 Start a backend server, with \fIargs\fR specifying what to listen to.