X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=net%2Fsocket.c;h=ec077037f534b6a3265342fc0ccfd1dd56893505;hb=9a79b2274186fade17134929d4f85b70d59a3840;hp=f4530196a70a30c10f87450ad47bdfaa9e28f925;hpb=d07b3c25327c5ae3792d0ed0c135dee4727200a1;p=linux-2.6-omap-h63xx.git

diff --git a/net/socket.c b/net/socket.c
index f4530196a70..ec077037f53 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -272,8 +272,7 @@ static int init_inodecache(void)
 					      (SLAB_HWCACHE_ALIGN |
 					       SLAB_RECLAIM_ACCOUNT |
 					       SLAB_MEM_SPREAD),
-					      init_once,
-					      NULL);
+					      init_once);
 	if (sock_inode_cachep == NULL)
 		return -ENOMEM;
 	return 0;
@@ -1939,9 +1938,7 @@ asmlinkage long sys_recvmsg(int fd, struct msghdr __user *msg,
 	total_len = err;
 
 	cmsg_ptr = (unsigned long)msg_sys.msg_control;
-	msg_sys.msg_flags = 0;
-	if (MSG_CMSG_COMPAT & flags)
-		msg_sys.msg_flags = MSG_CMSG_COMPAT;
+	msg_sys.msg_flags = flags & (MSG_CMSG_CLOEXEC|MSG_CMSG_COMPAT);
 
 	if (sock->file->f_flags & O_NONBLOCK)
 		flags |= MSG_DONTWAIT;