diff --git a/[refs] b/[refs]
index d874619535f9..a8cd7378b761 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d35c7b0e54a596c5a8134d75999b7f391a9c6550
+refs/heads/master: 269f21344b23e552c21c9e2d7ca258479dcd7a0a
diff --git a/trunk/ipc/mqueue.c b/trunk/ipc/mqueue.c
index 94fd3b08fb77..b3b69fd51330 100644
--- a/trunk/ipc/mqueue.c
+++ b/trunk/ipc/mqueue.c
@@ -673,7 +673,7 @@ asmlinkage long sys_mq_open(const char __user *u_name, int oflag, mode_t mode,
 	if (IS_ERR(name = getname(u_name)))
 		return PTR_ERR(name);
 
-	fd = get_unused_fd();
+	fd = get_unused_fd_flags(O_CLOEXEC);
 	if (fd < 0)
 		goto out_putname;
 
@@ -709,7 +709,6 @@ asmlinkage long sys_mq_open(const char __user *u_name, int oflag, mode_t mode,
 		goto out_putfd;
 	}
 
-	set_close_on_exec(fd, 1);
 	fd_install(fd, filp);
 	goto out_upsem;