Merge branch 'pm-sleep'

* pm-sleep: epoll: Fix user space breakage related to EPOLLWAKEUP
mariux64 · May 22, 2012 · 8714c8d · 8714c8d
2 parents 0033c15 + a815941
commit 8714c8d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/fs/eventpoll.c b/fs/eventpoll.c
@@ -1711,7 +1711,7 @@ SYSCALL_DEFINE4(epoll_ctl, int, epfd, int, op, int, fd,
 
 	/* Check if EPOLLWAKEUP is allowed */
 	if ((epds.events & EPOLLWAKEUP) && !capable(CAP_EPOLLWAKEUP))
-		goto error_tgt_fput;
+		epds.events &= ~EPOLLWAKEUP;
 
 	/*
 	 * We have to check that the file structure underneath the file descriptor