X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;ds=sidebyside;f=fs%2Feventpoll.c;h=bd056a5b4efc59ceccb8b121100d40e2bb16cf3f;hb=8fc795f703c5138e1a8bfb88c69f52632031aa6a;hp=70aa66c96c5162c102f041e65bf52db4a6237a48;hpb=ab09203e302b6e526f6930f3e460064b0f253ae9;p=safe%2Fjmp%2Flinux-2.6

diff --git a/fs/eventpoll.c b/fs/eventpoll.c
index 70aa66c..bd056a5 100644
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@ -251,7 +251,7 @@ ctl_table epoll_table[] = {
 		.data		= &max_user_watches,
 		.maxlen		= sizeof(int),
 		.mode		= 0644,
-		.proc_handler	= &proc_dointvec_minmax,
+		.proc_handler	= proc_dointvec_minmax,
 		.extra1		= &zero,
 	},
 	{ }
@@ -1206,7 +1206,7 @@ SYSCALL_DEFINE1(epoll_create1, int, flags)
 	 * a file structure and a free file descriptor.
 	 */
 	error = anon_inode_getfd("[eventpoll]", &eventpoll_fops, ep,
-				 flags & O_CLOEXEC);
+				 O_RDWR | (flags & O_CLOEXEC));
 	if (error < 0)
 		ep_free(ep);