From 1d02ae31d01d11770dcba6d3ac2f1b0c8aaf8f78 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Fri, 15 Jan 2010 01:08:58 -0800
Subject: [PATCH] --- yaml --- r: 183509 b: refs/heads/master c:
 4d0392be21d4710121f855c0caf57d32ffd1ced0 h: refs/heads/master i:   183507:
 3efd3a97a51579906d86e8672cf7f1f8745b35af v: v3

---
 [refs]                | 2 +-
 trunk/net/core/sock.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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))