From nobody Mon Nov 29 22:05:37 2021 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 F168118C7CAB; Mon, 29 Nov 2021 22:05:39 +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 4J2ztp57N6z3G6B; Mon, 29 Nov 2021 22:05:38 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 18EDF2805; Mon, 29 Nov 2021 22:05:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1ATM5bur075766; Mon, 29 Nov 2021 22:05:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ATM5bYJ075765; Mon, 29 Nov 2021 22:05:37 GMT (envelope-from git) Date: Mon, 29 Nov 2021 22:05:37 GMT Message-Id: <202111292205.1ATM5bYJ075765@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: a8efd4d1b3b4 - main - syscalls: make syscall and __syscall SYSMUX 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a8efd4d1b3b43a5762f87befe22dd6e1cda73373 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638223539; 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=F6EjmFPMyFT4GOERKLEwFX2BZHz7vksVNy7JPI2AMTQ=; b=q7LedPJWPgGJKExHnRoBEzxL97fbYDudkteynq3+ni2MrGnWTDB7pNdOxLLvQcZU+lzVa0 G4eNHOQPRGrZE5L2D6enZzd+1CtHdSDkc//lwKYHxVHD2ykluBPAUQcLrz6ZOCeyPH8NxJ wxcxrA5k2DmiXtHaOr8ZieZxGMqaL52FSN2Uq+w+8/hTomLMhiJh8xRIZt/w/sIZg9dtL3 Skgr7HropkZnGou1la+UCI6rgde/izG2TkxJgJiw0TAzzuDAKIcrJsPmW+UDpwKRvyOAes 89KPG44PK1TeEMnXZX3yPeoG6eRRY7CPLIep8ihdQmoRlQAAF3W03MwIkTIAxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638223539; a=rsa-sha256; cv=none; b=nZJulTzVreMWIiQd7s1YEpsubtVKoSgQMl4+GWjsHQqpxzFdKEONv2+HhUZ1ooPnwodFqy eVJgeHrQ5mg3feVuCjHc4HW0gSpN/HR/P+WFnYCNikIG2yh2ebf0vVst3olxHEzJV/axKi sonoSLsGBwNbp1Au6tRzJNZxbB9wHNBOLGzKfCDjehiwCz37PkuQNuVlLyJJB8XLxgrV3o FGYXu6YhtzWecOc2v409l5FnJ88e/oZHqKRrs/KzLV4RTens44O8SaNYuKaDpSvND0ugoz FHVeEWes63MCzhH34RavZo4GJw3rAP8hOJTHIWs98Rwc1W/6nKHnAmaS31GKDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=a8efd4d1b3b43a5762f87befe22dd6e1cda73373 commit a8efd4d1b3b43a5762f87befe22dd6e1cda73373 Author: Brooks Davis AuthorDate: 2021-11-29 22:03:00 +0000 Commit: Brooks Davis CommitDate: 2021-11-29 22:04:44 +0000 syscalls: make syscall and __syscall SYSMUX Rather than combining the declearation of nosys with the registration of SYS_syscall, declare syscall(2) and __syscall(2) with the new SYSMUX type in syscalls.master and declare nosys directly. This eliminates the last use of syscall aliases in the tree. Reviewed by: kib, imp --- sys/kern/syscalls.master | 18 ++++++++++++------ sys/sys/sysent.h | 6 ++++++ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master index 96541023ec28..92cc727f22c9 100644 --- a/sys/kern/syscalls.master +++ b/sys/kern/syscalls.master @@ -114,9 +114,12 @@ #include %%ABI_HEADERS%% -0 AUE_NULL STD { - int nosys(void); - } syscall nosys_args int +0 AUE_NULL SYSMUX { + int syscall( + int number, + ... + ); + } 1 AUE_EXIT STD|CAPENABLED { void exit( int rval @@ -1194,9 +1197,12 @@ off_t pos ); } -198 AUE_NULL NOPROTO { - int nosys(void); - } __syscall __syscall_args int +198 AUE_NULL SYSMUX { + int __syscall( + int64_t number, + ... + ); + } 199 AUE_LSEEK COMPAT6|CAPENABLED { off_t lseek( int fd, diff --git a/sys/sys/sysent.h b/sys/sys/sysent.h index fc678d49750a..e0b067927036 100644 --- a/sys/sys/sysent.h +++ b/sys/sys/sysent.h @@ -192,6 +192,12 @@ extern struct sysentvec aout_sysvec; extern struct sysent sysent[]; extern const char *syscallnames[]; +struct nosys_args { + register_t dummy; +}; + +int nosys(struct thread *, struct nosys_args *); + #define NO_SYSCALL (-1) struct module;