X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=fs%2Feventpoll.c;h=1e009cad8d5cac61832ebb3916033780f2fec1a6;hb=6dd0c1655be26345960a6bae574c7dc4648611d3;hp=d77f94491352f7d7decb81de214696eb53b2d30e;hpb=b3890e4704594fa23abe1395d1fafc97d3214be8;p=mirror_ubuntu-zesty-kernel.git

diff --git a/fs/eventpoll.c b/fs/eventpoll.c
index d77f94491352..1e009cad8d5c 100644
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@ -1639,9 +1639,9 @@ fetch_events:
 
 			spin_lock_irqsave(&ep->lock, flags);
 		}
-		__remove_wait_queue(&ep->wq, &wait);
 
-		set_current_state(TASK_RUNNING);
+		__remove_wait_queue(&ep->wq, &wait);
+		__set_current_state(TASK_RUNNING);
 	}
 check_events:
 	/* Is it worth to try to dig for events ? */