From nobody Fri Apr 21 05:39:35 2023 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 4Q2jyc1GyPz4788K; Fri, 21 Apr 2023 05:39:36 +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 4Q2jyb6mlqz3LmY; Fri, 21 Apr 2023 05:39:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682055576; 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=0EU6r2yHcLkYNUy9kbvic5uAtUW4n53VOh6NQNXGPOs=; b=mT8WkuoEK3Plfu0TRqc/hA5yAx7CBxnjs3Oa+UfAnTKjudgJAlsYMNuo7vUPJA2cV0rxP7 ns7MExYTaFkoBWx6U/+tIAkUYq43awJkR0TsqqLPD8naDrFHtMoT/KpVQ05fvZFE4zF15t pcV6h+kD6/jhVxS8YQh2FlhFcoH5/VK1AumSPYce2RCcorkTtVluj67URZCTDSe8lnv3Qg /KPBklShIvDAZPQG6vL0/RDDYWR7eU20KZaEVdXis7JYxkju+JeMrAj/0MoEiEirFTEPr4 5D1F346ZzOazVQ7xIk3w1GGrFR5vlsDYHlUjbcar6dznTWTVMe4Oc4pYQXPAtg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682055576; 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=0EU6r2yHcLkYNUy9kbvic5uAtUW4n53VOh6NQNXGPOs=; b=izb+1SCSiGdiJShCvoRfTM7+y3TclzGVEa5km1qK/Sg5U9BqEaYEU5usDbBlTa5bzrAHzQ HObRQWMnHh5eofHnfDD3MhqE8emSfZV9BPZrp0t8tArpwYEQmzjyrAMGwdQhkLgiDKF3a9 sefQ9wvz06IAUrFQJ6rvRkQiIInRyMB5onOBOVyy973O0izXuyfmiYPznRMoNy/GwyQ3n4 CgLxA+fbIuPIH77KuEZeZTSMpgy3HF+xxO2iZlemK8uZeNa+39PEwuu4vhlNL+PD0RIhq0 L+RMNV1kSCrGSpCybjHKNFL4MGx+v/ojKmjd781Sj/ycpfL/QSV/O4d9XEZqsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682055576; a=rsa-sha256; cv=none; b=lIXrM1ogtLfl585Wiy2nb5KmBv38iahTG4hpMEt2jVIPam5exK680iOlmfJxXpbtztl+PX g1teoBWFpD5nNc2k2d6X7KfeMySLa+pCOyOYKduU+Y80PlNS0A9Mvtrw0s+jlr/eguahGi ZrBBK0dfX12BiketZyi6q3+2dwvPcma+r9pAHPzt+7Khxx9Nl398Coy7wK8S/A3GWfANKW JHP57dqjPneyNQjtbJMUTsTdUG8d7WtZQFTKqlisZWiF1u7wrBCyzOAHx7Pyj/e8OL3Rh/ 1+wM19IeCMh7PmR4K2ktCCutxh2cPDZCzr286btrDPAjVfsb7+PFFBwBO7AUcQ== 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 4Q2jyb58gWz17WW; Fri, 21 Apr 2023 05:39:35 +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 33L5dZAg065019; Fri, 21 Apr 2023 05:39:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33L5dZ4K065018; Fri, 21 Apr 2023 05:39:35 GMT (envelope-from git) Date: Fri, 21 Apr 2023 05:39:35 GMT Message-Id: <202304210539.33L5dZ4K065018@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: 602b575a88ed - main - syscall.master: Remove stray 4.2 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 602b575a88ed4ce12358837daa4d0608a08e03c0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=602b575a88ed4ce12358837daa4d0608a08e03c0 commit 602b575a88ed4ce12358837daa4d0608a08e03c0 Author: Warner Losh AuthorDate: 2023-04-21 05:05:30 +0000 Commit: Warner Losh CommitDate: 2023-04-21 05:39:23 +0000 syscall.master: Remove stray 4.2 Back in 4.3BSD, the system call table wasn't generated, and there was an entry: "4.2 sigreturn", /* 139 = old 4.2 sigreturn */ This got converted to 139 OBSOL 0 4.2 sigreturn in 4.3 RENO. Since it was obsolete, nothing bad happened. In fact, there was code in makeyscalls.sh to cope: { comment = $4 for (i = 5; i <= NF; i++) comment = comment " " $i if (NF < 5) $5 = $4 } so the generated comment in syscalls.c was almost correct: "obs_4.2", /* 139 = obsolete 4.2 sigreturn */ a bug that we have to this very day, despite makesyscalls.sh being rewritten in lua. However, this historical wart is the only place in our current syscalls.master file where we have an extra field for the 'not generated' class of system calls. Remove the historical wart so that the re-write of makesyscalls.lua can be simpler (so, I hope, qemu's bsd-user can large swathes of code automatically generated too). This should help make things more understandable (changes to simplify makesyscalls.lue aren't quite debugged, so have to wait for another day). There's 3 different obsolete sigreturns (but only 1 that was ever in FreeBSD 2.x and newer). Sponsored by: Netflix --- sys/kern/syscalls.master | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master index af2f4194e2c5..c3e2a0343fde 100644 --- a/sys/kern/syscalls.master +++ b/sys/kern/syscalls.master @@ -917,7 +917,7 @@ _In_ _Contains_long_timet_ const struct timeval *tptr ); } -139 AUE_NULL OBSOL 4.2 sigreturn +139 AUE_NULL OBSOL sigreturn 140 AUE_ADJTIME STD { int adjtime( _In_ _Contains_long_timet_ const struct timeval *delta,