summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLucian Adrian Grijincu <lucian.grijincu@gmail.com>2011-05-23 11:57:33 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-23 15:14:11 -0700
commit52307a9e1d8910e205f6be2c4dd35900f7b11282 (patch)
tree243c21dbaf6953c6c1099bd0e1dc293647844359 /Documentation
parent56dab6c20808f0405fee66ddc3dd092fd115d911 (diff)
downloadlinux-52307a9e1d8910e205f6be2c4dd35900f7b11282.tar.gz
linux-52307a9e1d8910e205f6be2c4dd35900f7b11282.tar.bz2
linux-52307a9e1d8910e205f6be2c4dd35900f7b11282.zip
Documentation: update epoll sysctl text
max_user_instances was removed in this commit: commit 9df04e1f25effde823a600e755b51475d438f56b Author: Davide Libenzi <davidel@xmailserver.org> Date: Thu Jan 29 14:25:26 2009 -0800 epoll: drop max_user_instances and rely only on max_user_watches but the documentation entry was not removed. Cc: Davide Libenzi <davidel@xmailserver.org> Signed-off-by: Lucian Adrian Grijincu <lucian.grijincu@gmail.com> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/sysctl/fs.txt7
1 files changed, 0 insertions, 7 deletions
diff --git a/Documentation/sysctl/fs.txt b/Documentation/sysctl/fs.txt
index 4af0614147ef..88fd7f5c8dcd 100644
--- a/Documentation/sysctl/fs.txt
+++ b/Documentation/sysctl/fs.txt
@@ -231,13 +231,6 @@ its creation).
This directory contains configuration options for the epoll(7) interface.
-max_user_instances
-------------------
-
-This is the maximum number of epoll file descriptors that a single user can
-have open at a given time. The default value is 128, and should be enough
-for normal users.
-
max_user_watches
----------------