From 597fa43c2c6103bd102e7a2b850cd503cf08b917 Mon Sep 17 00:00:00 2001 From: Michael Kerrisk Date: Sun, 1 Feb 2009 08:23:38 +1300 Subject: [PATCH] epoll.7: remove documentation of /proc/sys/fs/epoll/max_user_instances This /proc interface appeared in 2.6.28. but will be removed in 2.6.29. Also, document change in default value of /proc/sys/fs/epoll/max_user_watches (was 1/32 of lowmem, now 1/25 of lowmem). Signed-off-by: Michael Kerrisk --- man7/epoll.7 | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/man7/epoll.7 b/man7/epoll.7 index 7c67e1381..6ee686eaf 100644 --- a/man7/epoll.7 +++ b/man7/epoll.7 @@ -18,7 +18,7 @@ .\" .\" Davide Libenzi .\" -.TH EPOLL 7 2009-01-17 "Linux" "Linux Programmer's Manual" +.TH EPOLL 7 2009-02-01 "Linux" "Linux Programmer's Manual" .SH NAME epoll \- I/O event notification facility .SH SYNOPSIS @@ -172,10 +172,11 @@ with .SS /proc interfaces The following interfaces can be used to limit the amount of kernel memory consumed by epoll: -.TP -.IR /proc/sys/fs/epoll/max_user_instances " (since Linux 2.6.28)" -This specifies an upper limit on the number of epoll instances -that can be created per real user ID. +.\" Following was added in 2.6.28, but them removed in 2.6.29 +.\" .TP +.\" .IR /proc/sys/fs/epoll/max_user_instances " (since Linux 2.6.28)" +.\" This specifies an upper limit on the number of epoll instances +.\" that can be created per real user ID. .TP .IR /proc/sys/fs/epoll/max_user_watches " (since Linux 2.6.28)" This specifies a limit on the total number of @@ -185,10 +186,10 @@ The limit is per real user ID. Each registered file descriptor costs roughly 90 bytes on a 32-bit kernel, and roughly 160 bytes on a 64-bit kernel. Currently, -.\" 2.6.28 +.\" 2.6.29 (in 2.6.28, the default was 1/32 of lowmem) the default value for .I max_user_watches -is 1/32 of the available low memory, +is 1/25 (4%) of the available low memory, divided by the registration cost in bytes. .SS Example for Suggested Usage While the usage of