Merge tag 'for-linus-4.5' of git://git.code.sf.net/p/openipmi/linux-ipmi

[deliverable/linux.git] / net / socket.c

diff --git a/net/socket.c b/net/socket.c
index d730ef9dfbf02aba150d5229a0d2875ddc23aa4d..91c2de6f50205ae955afa1a41ad9502d35853c05 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -2041,6 +2041,7 @@ int __sys_sendmmsg(int fd, struct mmsghdr __user *mmsg, unsigned int vlen,
                if (err)
                        break;
                ++datagrams;
+               cond_resched();
        }
 
        fput_light(sock->file, fput_needed);
@@ -2236,6 +2237,7 @@ int __sys_recvmmsg(int fd, struct mmsghdr __user *mmsg, unsigned int vlen,
                /* Out of band data, return right away */
                if (msg_sys.msg_flags & MSG_OOB)
                        break;
+               cond_resched();
        }
 
 out_put: