diff --git a/[refs] b/[refs]
index c272c37918ee..cb173071d734 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a58a80a701bdb2d220cdab4914218df5b48d781
+refs/heads/master: 4d0392be21d4710121f855c0caf57d32ffd1ced0
diff --git a/trunk/net/core/sock.c b/trunk/net/core/sock.c
index e1f6f225f012..10b1d3243a72 100644
--- a/trunk/net/core/sock.c
+++ b/trunk/net/core/sock.c
@@ -741,7 +741,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
 		struct timeval tm;
 	} v;
 
-	unsigned int lv = sizeof(int);
+	int lv = sizeof(int);
 	int len;
 
 	if (get_user(len, optlen))