diff --git a/[refs] b/[refs] index b2ccdc8c9ee5..21fb202347b6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8d334acdd2c1f57c7a574c6f24d08e4c95582ff0 +refs/heads/master: 1b9d5ff7644ddf2723c9205f4726c95ec01bf033 diff --git a/trunk/ipc/mqueue.c b/trunk/ipc/mqueue.c index 57ed704d2ca7..5eaecf4fc04e 100644 --- a/trunk/ipc/mqueue.c +++ b/trunk/ipc/mqueue.c @@ -108,7 +108,7 @@ static struct ipc_namespace *get_ns_from_inode(struct inode *inode) } static struct inode *mqueue_get_inode(struct super_block *sb, - struct ipc_namespace *ipc_ns, int mode, + struct ipc_namespace *ipc_ns, umode_t mode, struct mq_attr *attr) { struct user_struct *u = current_user();