From nobody Thu May 23 19:42:16 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VldqF16PYz5L9b6; Thu, 23 May 2024 19:42:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VldqD5zx6z55Qq; Thu, 23 May 2024 19:42:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716493336; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CZfpfOcqj2wYU20Hqfjl87D8IPng2DeWjr22XdV8m/k=; b=fzCxcvcBCoWGTNXJlGRRJOpiq6iqU0jt68iMoon4Gb401/wDD2307YFHHzGrlKBytrl4k3 tr07ODAxzJvEmIlcxwuM/pHjGXc5vpbub0Vj84egnaeWhCuATgSTIQG4UR09OA7fdxa60X PstDUaDwU5IiIXyljN27RdyO9djPRX7ZDRhIcTlHVrOFY6BXnelfQghG5z3UU5vZ4HAW+R 5hmZkY/sbmpOPRhBbb+anrutWRYMtwlRIhuzQltdYMVl7ReWrRrftSgTTgc35ikQQUtaoA iOoRxuAXTUT8KCWi27h6UAG3z1el7dX7+1UH8PhO3e4sAYWRY537LL9crHL5HA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716493336; a=rsa-sha256; cv=none; b=b/QwTSsgWyWneHlvTC+guR7+UFwobyY2JR7YmnCqZ+re54KxXUPx+oQHCrf5wyeajiH8mF qJi2388QLEGnRMbzUb4srfDse5I2CKNgTuaHc2eCu3z6LGSYvhsmJ9GUvG0/6kvET95gPl 3uxUQsdAyGZX/ioC5K31+0XB+9O0cdpP+woCyrNuXEbC7JiWmNBpZSV/pJ3SKbB0oGpZ1J n7UJ3ZtTXAvWVekLCvMF0ikqy/1CJwJQ1v/OCSvrDYE3yV/bmrbejYVu1ubtDy6z82cIgL N4K8vXh2HcQNgQlRprtllPaS1xt7srGiPsDOVlCfGZrPgvoIE6naZkTsWJoy+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716493336; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CZfpfOcqj2wYU20Hqfjl87D8IPng2DeWjr22XdV8m/k=; b=vH4QcFk0wUujwMkQR9t8jqIhAvjJXdYztytvh/J6VqBrO8LnOGYGHa6ROPoiuG/0yigWKd i5R2bpwAIowG+hAIvd3GFGFoCX4vWm5dMC7wzs9mHet/Pak040Q1As/tZHA//prXUqphDZ 80320zknhsJT3w56ZqIjM9F4RGIe9PHoTqHvPxoiNiH7/5xz2PirVWfbMB9DDmhn+icDdT VDFeCJwxHktwlK34mLdaIx1X5f6WH7lTdV8BMG9U7QZZDWsOEix/Djwb/WCzH17/oS3VZJ dzL8wLY6ga4oFEPjGsE5ZkN2ZulDGrQqrLc8MOvNZdP3fgVyk89KeSw6KV8ZPA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VldqD5bwbz13Gd; Thu, 23 May 2024 19:42:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44NJgGM0082865; Thu, 23 May 2024 19:42:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44NJgGSc082862; Thu, 23 May 2024 19:42:16 GMT (envelope-from git) Date: Thu, 23 May 2024 19:42:16 GMT Message-Id: <202405231942.44NJgGSc082862@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 9a9677ec1cbf - main - linux: Update linux manpage to mention mqueuefs List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9a9677ec1cbf46a86a032d18e790aa0fedc82e28 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=9a9677ec1cbf46a86a032d18e790aa0fedc82e28 commit 9a9677ec1cbf46a86a032d18e790aa0fedc82e28 Author: Ricardo Branco AuthorDate: 2024-05-19 09:37:12 +0000 Commit: Warner Losh 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 #include #include 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 */