Merge tag 'pwm/for-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry...

[deliverable/linux.git] / fs / proc / fd.c

diff --git a/fs/proc/fd.c b/fs/proc/fd.c
index 3c2a915c695a319708c2939c9bb8923b73508112..56afa5ef08f2dbca5f36f5feafa2a257bf525ab3 100644 (file)
--- a/fs/proc/fd.c
+++ b/fs/proc/fd.c
@@ -258,6 +258,7 @@ static int proc_readfd_common(struct file *file, struct dir_context *ctx,
                                     name, len, instantiate, p,
                                     (void *)(unsigned long)fd))
                        goto out_fd_loop;
+               cond_resched();
                rcu_read_lock();
        }
        rcu_read_unlock();