The branch main has been updated by imp:
URL:
https://cgit.FreeBSD.org/src/commit/?id=9a9677ec1cbf46a86a032d18e790aa0fedc82e28
commit 9a9677ec1cbf46a86a032d18e790aa0fedc82e28
Author: Ricardo Branco <rbra...@suse.de>
AuthorDate: 2024-05-19 09:37:12 +0000
Commit: Warner Losh <i...@freebsd.org>
CommitDate: 2024-05-23 19:40:47 +0000
linux: Update linux manpage to mention mqueuefs
Reviewed by: imp, kib
Pull Request: https://github.com/freebsd/freebsd-src/pull/1248
---
share/man/man4/linux.4 | 6 +++++-
sys/compat/linux/linux_misc.c | 2 --
sys/sys/syscallsubr.h | 18 +++++++++---------
3 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/share/man/man4/linux.4 b/share/man/man4/linux.4
index a50e1513ba43..212dd2526f3f 100644
--- a/share/man/man4/linux.4
+++ b/share/man/man4/linux.4
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd January 9, 2022
+.Dd May 19, 2024
.Dt LINUX 4
.Os
.Sh NAME
@@ -162,6 +162,9 @@ file descriptor file system mounted with the
.Cm linrdlnk
option, see
.Xr fdescfs 4
+.It Pa /compat/linux/dev/mqueue
+symbolic link to a mqueuefs mount, see
+.Xr mqueuefs 4
.It Pa /compat/linux/dev/shm
in-memory file system, see
.Xr tmpfs 4
@@ -177,6 +180,7 @@ Linux kernel objects file system, see
.Xr fdescfs 4 ,
.Xr linprocfs 4 ,
.Xr linsysfs 4 ,
+.Xr mqueuefs 4 ,
.Xr pty 4 ,
.Xr tmpfs 4 ,
.Xr elf 5
diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c
index 14c36669efc8..aa6c3923067f 100644
--- a/sys/compat/linux/linux_misc.c
+++ b/sys/compat/linux/linux_misc.c
@@ -29,8 +29,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "opt_posix.h"
-
#include <sys/param.h>
#include <sys/fcntl.h>
#include <sys/jail.h>
diff --git a/sys/sys/syscallsubr.h b/sys/sys/syscallsubr.h
index 8ac3f55596e6..2e0a362f90ad 100644
--- a/sys/sys/syscallsubr.h
+++ b/sys/sys/syscallsubr.h
@@ -213,6 +213,15 @@ int kern_kqueue(struct thread *td, int flags,
struct filecaps *fcaps);
int kern_kldload(struct thread *td, const char *file, int *fileid);
int kern_kldstat(struct thread *td, int fileid, struct kld_file_stat *stat);
int kern_kldunload(struct thread *td, int fileid, int flags);
+int kern_kmq_notify(struct thread *, int, struct sigevent *);
+int kern_kmq_open(struct thread *, const char *, int, mode_t,
+ const struct mq_attr *);
+int kern_kmq_setattr(struct thread *, int, const struct mq_attr *,
+ struct mq_attr *);
+int kern_kmq_timedreceive(struct thread *, int, char *,
+ size_t, unsigned int *, const struct timespec *);
+int kern_kmq_timedsend(struct thread *td, int, const char *,
+ size_t, unsigned int, const struct timespec *);
int kern_linkat(struct thread *td, int fd1, int fd2, const char *path1,
const char *path2, enum uio_seg segflg, int flag);
int kern_listen(struct thread *td, int s, int backlog);
@@ -386,15 +395,6 @@ int kern_writev(struct thread *td, int fd, struct
uio *auio);
int kern_socketpair(struct thread *td, int domain, int type, int protocol,
int *rsv);
int kern_unmount(struct thread *td, const char *path, int flags);
-int kern_kmq_notify(struct thread *, int, struct sigevent *);
-int kern_kmq_open(struct thread *, const char *, int, mode_t,
- const struct mq_attr *);
-int kern_kmq_setattr(struct thread *, int, const struct mq_attr *,
- struct mq_attr *);
-int kern_kmq_timedreceive(struct thread *, int, char *,
- size_t, unsigned int *, const struct timespec *);
-int kern_kmq_timedsend(struct thread *td, int, const char *,
- size_t, unsigned int, const struct timespec *);
/* flags for kern_sigaction */
#define KSA_OSIGSET 0x0001 /* uses osigact_t */
