From nobody Thu Apr 20 22:19:28 2023 X-Original-To: dev-commits-src-all@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 4Q2XBm72Zhz46gWB; Thu, 20 Apr 2023 22:19:28 +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 4Q2XBm5TvKz43CV; Thu, 20 Apr 2023 22:19:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682029168; 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=kLflGehLP0ebpWWeoaLu1FLOFVhESwaEqoN2h3MpRGo=; b=ftXwCjFd3ge+RnYBfvXReMIVSGrqHmvLf8bvpG2XoFQsCudBVbkxSdzgVeLTl6XmwWwBmv UWFrCtElpOzS6YKJ002qkjkvaASbE68vaT77S2x8XFq9vW4frIicklH3MlchGTewPHTIzX J9CVUdOm3lOeuqvWLpJ9KHMalHslNoOjC9w90a8iFQQfj1c77f/F2rTz15fNYwha+k/cUw jaSKQ7I6XGObvsAAhnZ4tkjDG750NKMvQd74RPI11PYN7abumbxK6wzkJmjDsvvh/KDsgE SYNT3V86e5EVofm6HYRxlg56jgVEToUuzVvuY3qryPcKuOX4K75PpbKHZAqYVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682029168; 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=kLflGehLP0ebpWWeoaLu1FLOFVhESwaEqoN2h3MpRGo=; b=dNvcpzqlT3oPkCG2Qtg0Cejh0MbG2TeRXj1OvP4ZnMXuj9E35tOyzfqe7ZY9GHTl4Q7qeL LuiQumB5kKjoVXG6wAN3LQeDCEDo2x4KFh16xNeyCsxlG6NfpDiXQlEXuQorBjUhElm3D/ N4AmWEHjSHw582MujY9SIm7mVgN+guY+rR0Jn+OfGNDVUbuZbpjQ9zlnXeq40j14zlIe2c 7VMBfB8yKZ+5IwIh0xxFWCntxhyrzhDCQmaTN8O5dk4HGyKWCmBAsLTRZ97diDvmSmLJ7S biEobBQmr21cNgy+gHsgxnqRQnQpn0aZW1hs10FH2+z0mm6NReYbdLb8l4TW8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682029168; a=rsa-sha256; cv=none; b=JwzNxrA4ByeuqBabDGeX/UwNIDR96om2d8xleubIwju00CIPMUdy6mQsFjJot60U68g+xs XlWdWip8PeoPBNLjTIDLuRyf5P+7XgQETTHrpHrgFZKPKLkku/0qPo0r+PjCN9yLKxcjzg 0IgClRf2pCJCF9z57xlirsJFla7zdc6I/2ehPC6MAPm0xkf0RuyWju12TpryTLXpY+7lmF x0w2W2BQTjJV9JLhFcdOkA0yflPM/b2Itiojz4YUYq48NWyv6ODN6/IfBFQDAI+6+iiORz mKbLzeEbfyVTBZce+WFoHNAbcnkrn1VjBsaoqdinCupgzFOhaTzQ0kz1RWUTyA== 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 4Q2XBm3yTfzw53; Thu, 20 Apr 2023 22:19:28 +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 33KMJSB0042284; Thu, 20 Apr 2023 22:19:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33KMJSY0042283; Thu, 20 Apr 2023 22:19:28 GMT (envelope-from git) Date: Thu, 20 Apr 2023 22:19:28 GMT Message-Id: <202304202219.33KMJSY0042283@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: 559b94a12257 - main - syscall.master: Fix comments List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 559b94a12257807115bf84264936f0de2ac3884e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=559b94a12257807115bf84264936f0de2ac3884e commit 559b94a12257807115bf84264936f0de2ac3884e Author: Warner Losh AuthorDate: 2023-04-20 22:16:21 +0000 Commit: Warner Losh CommitDate: 2023-04-20 22:18:02 +0000 syscall.master: Fix comments Have more accruate comments. While #if, #else, etc are copied to the header files, lines that don't start with # are not. And #include files are only output to sysinc (which winds up at the front of init_sysent.c which seems a bit odd). This is all radically undocumented, and likely has drifted somewhat from 4.4BSD and what other systems do (they've drifted too, fwiw). Sponsored by: Netflix --- sys/amd64/linux/syscalls.master | 6 ++++-- sys/amd64/linux32/syscalls.master | 6 ++++-- sys/arm64/linux/syscalls.master | 4 ++++ sys/i386/linux/syscalls.master | 4 ++++ sys/kern/syscalls.master | 4 +++- 5 files changed, 19 insertions(+), 5 deletions(-) diff --git a/sys/amd64/linux/syscalls.master b/sys/amd64/linux/syscalls.master index 90476b15433f..a2ac67c2d126 100644 --- a/sys/amd64/linux/syscalls.master +++ b/sys/amd64/linux/syscalls.master @@ -26,6 +26,10 @@ ; function prototype in sys/sysproto.h. Does add a ; definition to syscall.h besides adding a sysent. +; #include's, #defines's, etc. may be included, and are copied to the output +; files. However, #ifdef, etc will be copied, but any lines that don't start +; with # will not. Caveat Emptor. + #include #include #include @@ -36,8 +40,6 @@ ; Isn't pretty, but there seems to be no other way to trap nosys #define nosys linux_nosys -; #ifdef's, etc. may be included, and are copied to the output files. - 0 AUE_NULL NOPROTO { int read( int fd, diff --git a/sys/amd64/linux32/syscalls.master b/sys/amd64/linux32/syscalls.master index 4561667dc3cc..f84d51c372a8 100644 --- a/sys/amd64/linux32/syscalls.master +++ b/sys/amd64/linux32/syscalls.master @@ -26,6 +26,10 @@ ; function prototype in sys/sysproto.h. Does add a ; definition to syscall.h besides adding a sysent. +; #include's, #defines's, etc. may be included, and are copied to the output +; files. However, #ifdef, etc will be copied, but any lines that don't start +; with # will not. Caveat Emptor. + #include #include #include @@ -36,8 +40,6 @@ ; Isn't pretty, but there seems to be no other way to trap nosys #define nosys linux_nosys -; #ifdef's, etc. may be included, and are copied to the output files. - 0 AUE_NULL UNIMPL setup 1 AUE_EXIT STD { void linux_exit( diff --git a/sys/arm64/linux/syscalls.master b/sys/arm64/linux/syscalls.master index 647fd0262e8c..f4c2acca435d 100644 --- a/sys/arm64/linux/syscalls.master +++ b/sys/arm64/linux/syscalls.master @@ -3,6 +3,10 @@ ; Linux ABI system call generic name/number map, based on Linux file ; include/uapi/asm-generic/unistd.h +; #include's, #defines's, etc. may be included, and are copied to the output +; files. However, #ifdef, etc will be copied, but any lines that don't start +; with # will not. Caveat Emptor. + #include #include #include diff --git a/sys/i386/linux/syscalls.master b/sys/i386/linux/syscalls.master index a5b246c0822a..96b74e1cc649 100644 --- a/sys/i386/linux/syscalls.master +++ b/sys/i386/linux/syscalls.master @@ -26,6 +26,10 @@ ; function prototype in sys/sysproto.h. Does add a ; definition to syscall.h besides adding a sysent. +; #include's, #defines's, etc. may be included, and are copied to the output +; files. However, #ifdef, etc will be copied, but any lines that don't start +; with # will not. Caveat Emptor. + #include #include #include diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master index 92de51fc0d97..af2f4194e2c5 100644 --- a/sys/kern/syscalls.master +++ b/sys/kern/syscalls.master @@ -108,7 +108,9 @@ ; timet_ Object contains a time_t and varies between i386 and other ; ABIs. -; #ifdef's, etc. may be included, and are copied to the output files. +; #include's, #defines's, etc. may be included, and are copied to the output +; files. However, #ifdef, etc will be copied, but any lines that don't start +; with # will not. Caveat Emptor. #include #include