5 files changed, 103 insertions, 24 deletions

diff --git a/sys/amd64/linux/syscalls.master b/sys/amd64/linux/syscalls.master
index 92c142b521fd..91da10676669 100644
--- a/sys/amd64/linux/syscalls.master
+++ b/sys/amd64/linux/syscalls.master
@@ -1394,22 +1394,48 @@
 		int linux_get_mempolicy(void);
 	}
 240	AUE_NULL	STD {
-		int linux_mq_open(void);
+		int linux_mq_open(
+		    const char *name,
+		    l_int oflag,
+		    l_mode_t mode,
+		    struct mq_attr *attr
+		);
 	}
 241	AUE_NULL	STD {
-		int linux_mq_unlink(void);
+		int linux_mq_unlink(
+		    const char *name
+		);
 	}
 242	AUE_NULL	STD {
-		int linux_mq_timedsend(void);
+		int linux_mq_timedsend(
+		    l_mqd_t mqd,
+		    const char *msg_ptr,
+		    l_size_t msg_len,
+		    l_uint msg_prio,
+		    const struct l_timespec *abs_timeout
+		);
 	}
 243	AUE_NULL	STD {
-		int linux_mq_timedreceive(void);
+		int linux_mq_timedreceive(
+		    l_mqd_t mqd,
+		    char *msg_ptr,
+		    l_size_t msg_len,
+		    l_uint *msg_prio,
+		    const struct l_timespec *abs_timeout
+		);
 	}
 244	AUE_NULL	STD {
-		int linux_mq_notify(void);
+		int linux_mq_notify(
+		    l_mqd_t mqd,
+		    const struct l_timespec *abs_timeout
+		);
 	}
 245	AUE_NULL	STD {
-		int linux_mq_getsetattr(void);
+		int linux_mq_getsetattr(
+		    l_mqd_t mqd,
+		    const struct mq_attr *attr,
+		    struct mq_attr *oattr
+		);
 	}
 246	AUE_NULL	STD {
 		int linux_kexec_load(void);
diff --git a/sys/amd64/linux32/syscalls.master b/sys/amd64/linux32/syscalls.master
index 6310f6ecf444..fa10fbfb9369 100644
--- a/sys/amd64/linux32/syscalls.master
+++ b/sys/amd64/linux32/syscalls.master
@@ -1508,22 +1508,48 @@
 	}
 ; Linux 2.6.6:
 277	AUE_NULL	STD {
-		int linux_mq_open(void);
+		int linux_mq_open(
+		    const char *name,
+		    l_int oflag,
+		    l_mode_t mode,
+		    struct mq_attr *attr
+		);
 	}
 278	AUE_NULL	STD {
-		int linux_mq_unlink(void);
+		int linux_mq_unlink(
+		    const char *name
+		);
 	}
 279	AUE_NULL	STD {
-		int linux_mq_timedsend(void);
+		int linux_mq_timedsend(
+		    l_mqd_t mqd,
+		    const char *msg_ptr,
+		    l_size_t msg_len,
+		    l_uint msg_prio,
+		    const struct l_timespec *abs_timeout
+		);
 	}
 280	AUE_NULL	STD {
-		int linux_mq_timedreceive(void);
+		int linux_mq_timedreceive(
+		    l_mqd_t mqd,
+		    char *msg_ptr,
+		    l_size_t msg_len,
+		    l_uint *msg_prio,
+		    const struct l_timespec *abs_timeout
+		);
 	}
 281	AUE_NULL	STD {
-		int linux_mq_notify(void);
+		int linux_mq_notify(
+		    l_mqd_t mqd,
+		    const struct l_timespec *abs_timeout
+		);
 	}
 282	AUE_NULL	STD {
-		int linux_mq_getsetattr(void);
+		int linux_mq_getsetattr(
+		    l_mqd_t mqd,
+		    const struct mq_attr *attr,
+		    struct mq_attr *oattr
+		);
 	}
 283	AUE_NULL	STD {
 		int linux_kexec_load(void);
diff --git a/sys/arm64/linux/linux.h b/sys/arm64/linux/linux.h
index 3aecc9b94ce7..186a0b27cc9c 100644
--- a/sys/arm64/linux/linux.h
+++ b/sys/arm64/linux/linux.h
@@ -64,6 +64,7 @@ typedef l_ulong		l_size_t;
 typedef l_long		l_suseconds_t;
 typedef l_long		l_time_t;
 typedef l_int		l_timer_t;	/* XXX */
+typedef l_int		l_mqd_t;
 typedef l_ulong		l_fd_mask;
 
 typedef struct {
diff --git a/sys/arm64/linux/syscalls.master b/sys/arm64/linux/syscalls.master
index 852f3baf8879..9a259c02ad45 100644
--- a/sys/arm64/linux/syscalls.master
+++ b/sys/arm64/linux/syscalls.master
@@ -1040,22 +1040,48 @@
 		);
 	}
 180	AUE_NULL	STD	{
-		int linux_mq_open(void);
+		int linux_mq_open(
+		    const char *name,
+		    l_int oflag,
+		    l_mode_t mode,
+		    struct mq_attr *attr
+		);
 	}
 181	AUE_NULL	STD	{
-		int linux_mq_unlink(void);
+		int linux_mq_unlink(
+		    const char *name
+		);
 	}
 182	AUE_NULL	STD	{
-		int linux_mq_timedsend(void);
+		int linux_mq_timedsend(
+		    l_mqd_t mqd,
+		    const char *msg_ptr,
+		    l_size_t msg_len,
+		    l_uint msg_prio,
+		    const struct l_timespec *abs_timeout
+		);
 	}
 183	AUE_NULL	STD	{
-		int linux_mq_timedreceive(void);
+		int linux_mq_timedreceive(
+		    l_mqd_t mqd,
+		    char *msg_ptr,
+		    l_size_t msg_len,
+		    l_uint *msg_prio,
+		    const struct l_timespec *abs_timeout
+		);
 	}
 184	AUE_NULL	STD	{
-		int linux_mq_notify(void);
+		int linux_mq_notify(
+		    l_mqd_t mqd,
+		    const struct l_timespec *abs_timeout
+		);
 	}
 185	AUE_NULL	STD	{
-		int linux_mq_getsetattr(void);
+		int linux_mq_getsetattr(
+		    l_mqd_t mqd,
+		    const struct mq_attr *attr,
+		    struct mq_attr *oattr
+		);
 	}
 186	AUE_NULL	STD	{
 		int linux_msgget(
diff --git a/sys/i386/linux/syscalls.master b/sys/i386/linux/syscalls.master
index 51e360ac0ee4..1c7deecd8b58 100644
--- a/sys/i386/linux/syscalls.master
+++ b/sys/i386/linux/syscalls.master
@@ -1532,8 +1532,8 @@
 277	AUE_NULL	STD {
 		int linux_mq_open(
 		    const char *name,
-		    int oflag,
-		    mode_t mode,
+		    l_int oflag,
+		    l_mode_t mode,
 		    struct mq_attr *attr
 		);
 	}
@@ -1546,8 +1546,8 @@
 		int linux_mq_timedsend(
 		    l_mqd_t mqd,
 		    const char *msg_ptr,
-		    size_t msg_len,
-		    unsigned int msg_prio,
+		    l_size_t msg_len,
+		    l_uint msg_prio,
 		    const struct l_timespec *abs_timeout
 		);
 	}
@@ -1555,8 +1555,8 @@
 		int linux_mq_timedreceive(
 		    l_mqd_t mqd,
 		    char *msg_ptr,
-		    size_t msg_len,
-		    unsigned int msg_prio,
+		    l_size_t msg_len,
+		    l_uint *msg_prio,
 		    const struct l_timespec *abs_timeout
 		);
 	}