o Merge with Linux 2.1.90.

 o Divide L1 cache sizes by 1024 before printing, makes the numbers a
   bit more credible ...

1 files changed, 4 insertions, 2 deletions

diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 2fbce16fe..b04072d80 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -364,7 +364,7 @@ static int unix_create(struct socket *sock, int protocol)
 		default:
 			return -ESOCKTNOSUPPORT;
 	}
-	sk = sk_alloc(AF_UNIX, GFP_KERNEL);
+	sk = sk_alloc(AF_UNIX, GFP_KERNEL, 1);
 	if (!sk)
 		return -ENOMEM;
 
@@ -1265,7 +1265,9 @@ static int unix_stream_recvmsg(struct socket *sock, struct msghdr *msg, int size
 		}
 
 		chunk = min(skb->len, size);
-		/* N.B. This could fail with -EFAULT */
+		/* N.B. This could fail with a non-zero value (which means -EFAULT
+		 *      and the non-zero value is the number of bytes not copied).
+		 */
 		memcpy_toiovec(msg->msg_iov, skb->data, chunk);
 		copied += chunk;
 		size -= chunk;