Merge branch 'pm-core'

[mirror_ubuntu-zesty-kernel.git] / fs / select.c

diff --git a/fs/select.c b/fs/select.c
index 015547330e88699dccb37fe1d4509e1dc07394f7..79d0d4953cada643890cb6fd62323fa07a9dede5 100644 (file)
--- a/fs/select.c
+++ b/fs/select.c
@@ -778,8 +778,8 @@ static inline unsigned int do_pollfd(struct pollfd *pollfd, poll_table *pwait,
        return mask;
 }
 
-static int do_poll(unsigned int nfds,  struct poll_list *list,
-                  struct poll_wqueues *wait, struct timespec *end_time)
+static int do_poll(struct poll_list *list, struct poll_wqueues *wait,
+                  struct timespec *end_time)
 {
        poll_table* pt = &wait->pt;
        ktime_t expire, *to = NULL;
@@ -908,7 +908,7 @@ int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds,
        }
 
        poll_initwait(&table);
-       fdcount = do_poll(nfds, head, &table, end_time);
+       fdcount = do_poll(head, &table, end_time);
        poll_freewait(&table);
 
        for (walk = head; walk; walk = walk->next) {