diff options
Diffstat (limited to 'kernel/sysctl.c')
| -rw-r--r-- | kernel/sysctl.c | 12 | 
1 files changed, 11 insertions, 1 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index a13bd4dfaeb..3d56fe7570d 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -176,6 +176,9 @@ extern struct ctl_table random_table[];  #ifdef CONFIG_INOTIFY_USER  extern struct ctl_table inotify_table[];  #endif +#ifdef CONFIG_EPOLL +extern struct ctl_table epoll_table[]; +#endif  #ifdef HAVE_ARCH_PICK_MMAP_LAYOUT  int sysctl_legacy_va_layout; @@ -474,7 +477,7 @@ static struct ctl_table kern_table[] = {  		.mode		= 0644,  		.proc_handler	= &proc_dointvec,  	}, -#ifdef CONFIG_FTRACE +#ifdef CONFIG_FUNCTION_TRACER  	{  		.ctl_name	= CTL_UNNUMBERED,  		.procname	= "ftrace_enabled", @@ -1325,6 +1328,13 @@ static struct ctl_table fs_table[] = {  		.child		= inotify_table,  	},  #endif	 +#ifdef CONFIG_EPOLL +	{ +		.procname	= "epoll", +		.mode		= 0555, +		.child		= epoll_table, +	}, +#endif  #endif  	{  		.ctl_name	= KERN_SETUID_DUMPABLE,  |