Merge branches 'clockevents/4.4-fixes' and 'clockevents/4.5-fixes' of http://git.linaro.org/people/daniel.lezcano/linux into timers/urgent

Pull in fixes from Daniel Lezcano:

 - Fix the vt8500 timer leading to a system lock up when dealing with too
   small delta (Roman Volkov)

 - Select the CLKSRC_MMIO when the fsl_ftm_timer is enabled with COMPILE_TEST
   (Daniel Lezcano)

 - Prevent to compile timers using the 'iomem' API when the architecture has
   not HAS_IOMEM set (Richard Weinberger)

1 files changed, 3 insertions, 1 deletions

diff --git a/net/rds/send.c b/net/rds/send.c
index 827155c2ead1..c9cdb358ea88 100644
--- a/net/rds/send.c
+++ b/net/rds/send.c
@@ -1013,11 +1013,13 @@ int rds_sendmsg(struct socket *sock, struct msghdr *msg, size_t payload_len)
                 release_sock(sk);
         }
 
-        /* racing with another thread binding seems ok here */
+        lock_sock(sk);
         if (daddr == 0 || rs->rs_bound_addr == 0) {
+                release_sock(sk);
                 ret = -ENOTCONN; /* XXX not a great errno */
                 goto out;
         }
+        release_sock(sk);
 
         if (payload_len > rds_sk_sndbuf(rs)) {
                 ret = -EMSGSIZE;