diff --git a/[refs] b/[refs]
index 505037d6f93b..df48e9dd2c81 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe2d5295a11e2ab2d6f4e7ea074816000b32eba3
+refs/heads/master: 9261c9b042547d01eeb206cf0e21ce72832245ec
diff --git a/trunk/net/core/sock.c b/trunk/net/core/sock.c
index c13594579bfb..b32b1815ae5a 100644
--- a/trunk/net/core/sock.c
+++ b/trunk/net/core/sock.c
@@ -341,11 +341,11 @@ int sock_setsockopt(struct socket *sock, int level, int optname,
 				sock_reset_flag(sk, SOCK_LINGER);
 			else {
 #if (BITS_PER_LONG == 32)
-				if (ling.l_linger >= MAX_SCHEDULE_TIMEOUT/HZ)
+				if ((unsigned int)ling.l_linger >= MAX_SCHEDULE_TIMEOUT/HZ)
 					sk->sk_lingertime = MAX_SCHEDULE_TIMEOUT;
 				else
 #endif
-					sk->sk_lingertime = ling.l_linger * HZ;
+					sk->sk_lingertime = (unsigned int)ling.l_linger * HZ;
 				sock_set_flag(sk, SOCK_LINGER);
 			}
 			break;