diff --git a/fs/eventpoll.c b/fs/eventpoll.c index 3401387bb..c291bf61a 100644 --- a/fs/eventpoll.c +++ b/fs/eventpoll.c @@ -2161,9 +2161,6 @@ error_return: return error; } -/* limit minimal timeout to 1 HZ */ -int sysctl_min_epoll_wait_time = 1000/HZ; - /* * Implement the event wait interface for the eventpoll file. It is the kernel * part of the user space epoll_wait(2). @@ -2196,10 +2193,6 @@ SYSCALL_DEFINE4(epoll_wait, int, epfd, struct epoll_event __user *, events, if (!is_file_epoll(f.file)) goto error_fput; - if (timeout > 0 && sysctl_min_epoll_wait_time > 0 && - timeout < sysctl_min_epoll_wait_time) - timeout = sysctl_min_epoll_wait_time; - /* * At this point it is safe to assume that the "private_data" contains * our own data structure. diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 70e5650e3..29d320971 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -117,8 +117,6 @@ extern unsigned int sysctl_nr_open_min, sysctl_nr_open_max; extern int sysctl_nr_trim_pages; #endif -extern int sysctl_min_epoll_wait_time; - /* Constants used for minimum and maximum */ #ifdef CONFIG_LOCKUP_DETECTOR static int sixty = 60; @@ -292,13 +290,6 @@ static struct ctl_table sysctl_base_table[] = { .mode = 0555, .child = dev_table, }, - { - .procname = "min_epoll_wait_time", - .data = &sysctl_min_epoll_wait_time, - .maxlen = sizeof(sysctl_min_epoll_wait_time), - .mode = 0644, - .proc_handler = &proc_dointvec, - }, { } };