From nobody Fri Aug 8 09:37:43 2025 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 4byzTh08YGz63Qlh; Fri, 08 Aug 2025 09:37:44 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4byzTg2zYnz42vZ; Fri, 08 Aug 2025 09:37:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754645863; 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=VoyyOWNDcdPjS4sTRTzXWNFK0gwwzSSaPEViko6fH10=; b=HGgceeParIdZoWmY8mMRP4avnE033N4cz+jZSyt+SPTbF3AQR0EOtsu6wfSeH7uquj6nrw i/QAhPr0A1QD6AgS8nFsG1nygaWmKfkNi0lcea/rR8KJjkdauzjZMwRtTmNFNeULQRohl+ JOXspDlyHj/sovKy/ZI+Y3w7CWlFqDOCctQR3FSq8BKPbqNNIo3Aq088objT6M+al8LV3t OoApYEBjVfaQtvqNFhnd1dGdXgi4lAZGFkW3bU60SaP95YdBZlZwV7iUXTmwk6xiuOQmwr d1XFSioDjLvpJQASfGAC0WULJPzaMMUJCe3fyoey/N+zG+IH0rxsa5grldOsZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754645863; 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=VoyyOWNDcdPjS4sTRTzXWNFK0gwwzSSaPEViko6fH10=; b=IFjVEC5Yr3PpOju1/i39aOjDsqP/YdVdSDv2cYyJ0yT3t+Q2lILxeTEC6n6leNAzlAf1vs QsctFhEeV/W4C+eNlEfEaM4IVaesXDjpgDJOv7mNoWQkGhO3SI2TDnJFQGswPcJNv6gQRe uplZZY/TyCHWp1dVHa/3LwLDTtQYQGHwdUaN9FtRMEjQ8VceYVpHHjtYVbO2J5nUxvYitI xD6iHnahjwoU91pvWTWW3pcW+zqFFiF+JfrhO0Sw1SQedfRclErnJp1UubK25YGRcNwQjm 6F9wZ51UnUfaynOl9U3GkT05WUmmAWdAfyQmWgE6SLsFPLWtumtWDdlIZXyKzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754645863; a=rsa-sha256; cv=none; b=qhy7zT5m3OhZKXU02e5qJp0rbLZ1iCgb6+vkq8MSdRgcL/q5+vpXfZCp9LXA+tWfZrGy5g L+e7GNaH3/Ou6YsNQS7r5ud1e7zuIKyg9hUBriAkNr1td5qwVMY0yHYb/viOrSwfxp3lEy de0tRuCtMIWa2fuwvxsOvYVUqyOAN/Yx9UvFC8vgrjKBq9gSnSvOwbisaF82vxTedcQjOS C30OCX/q5oSHZ1ST5ng0uKoT3RL4gnSzHrvwSdCP2vD+NY7ONolLSc9XQnpITFevpnJSDW o77dJzhQorfyWG1VSzkeGztslQz/GuKoSkoCqG37GDFkFYXZv9b0uxD8F8by9g== 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 4byzTg19rLzTsb; Fri, 08 Aug 2025 09:37:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5789bhbE082982; Fri, 8 Aug 2025 09:37:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5789bhCC082976; Fri, 8 Aug 2025 09:37:43 GMT (envelope-from git) Date: Fri, 8 Aug 2025 09:37:43 GMT Message-Id: <202508080937.5789bhCC082976@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: 8433f8cd064a - main - sysent: regen for _exit(2) normalization 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 8433f8cd064a6c2f389e2cf5f447001c588a39e2 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=8433f8cd064a6c2f389e2cf5f447001c588a39e2 commit 8433f8cd064a6c2f389e2cf5f447001c588a39e2 Author: Brooks Davis AuthorDate: 2025-08-08 09:30:16 +0000 Commit: Brooks Davis CommitDate: 2025-08-08 09:30:16 +0000 sysent: regen for _exit(2) normalization --- lib/libsys/_libsys.h | 4 ++-- lib/libsys/syscalls.map | 2 +- sys/compat/freebsd32/freebsd32_syscall.h | 2 +- sys/compat/freebsd32/freebsd32_syscalls.c | 2 +- sys/compat/freebsd32/freebsd32_sysent.c | 2 +- sys/compat/freebsd32/freebsd32_systrace_args.c | 8 ++++---- sys/kern/init_sysent.c | 2 +- sys/kern/syscalls.c | 2 +- sys/kern/systrace_args.c | 8 ++++---- sys/sys/syscall.h | 4 +++- sys/sys/syscall.mk | 2 +- sys/sys/sysproto.h | 6 +++--- 12 files changed, 23 insertions(+), 21 deletions(-) diff --git a/lib/libsys/_libsys.h b/lib/libsys/_libsys.h index 7a1685cca2d1..f763916d495d 100644 --- a/lib/libsys/_libsys.h +++ b/lib/libsys/_libsys.h @@ -65,7 +65,7 @@ struct uuid; union semun; __BEGIN_DECLS -typedef void (__sys_exit_t)(int); +typedef void (__sys__exit_t)(int); typedef int (__sys_fork_t)(void); typedef ssize_t (__sys_read_t)(int, void *, size_t); typedef ssize_t (__sys_write_t)(int, const void *, size_t); @@ -469,7 +469,7 @@ typedef int (__sys_exterrctl_t)(u_int, u_int, void *); typedef int (__sys_inotify_add_watch_at_t)(int, int, const char *, uint32_t); typedef int (__sys_inotify_rm_watch_t)(int, int); -void __sys_exit(int rval); +void __sys__exit(int rval); int __sys_fork(void); ssize_t __sys_read(int fd, void * buf, size_t nbyte); ssize_t __sys_write(int fd, const void * buf, size_t nbyte); diff --git a/lib/libsys/syscalls.map b/lib/libsys/syscalls.map index 69fce2ea7c63..dbb011343c8f 100644 --- a/lib/libsys/syscalls.map +++ b/lib/libsys/syscalls.map @@ -7,7 +7,7 @@ FBSDprivate_1.0 { _syscall; __sys_syscall; - __sys_exit; + __sys__exit; _fork; __sys_fork; _read; diff --git a/sys/compat/freebsd32/freebsd32_syscall.h b/sys/compat/freebsd32/freebsd32_syscall.h index 8d2748098c00..971510ebb6b6 100644 --- a/sys/compat/freebsd32/freebsd32_syscall.h +++ b/sys/compat/freebsd32/freebsd32_syscall.h @@ -5,7 +5,7 @@ */ #define FREEBSD32_SYS_syscall 0 -#define FREEBSD32_SYS_exit 1 +#define FREEBSD32_SYS__exit 1 #define FREEBSD32_SYS_fork 2 #define FREEBSD32_SYS_read 3 #define FREEBSD32_SYS_write 4 diff --git a/sys/compat/freebsd32/freebsd32_syscalls.c b/sys/compat/freebsd32/freebsd32_syscalls.c index bda373268cc5..79c414b675b1 100644 --- a/sys/compat/freebsd32/freebsd32_syscalls.c +++ b/sys/compat/freebsd32/freebsd32_syscalls.c @@ -6,7 +6,7 @@ const char *freebsd32_syscallnames[] = { "syscall", /* 0 = syscall */ - "exit", /* 1 = exit */ + "_exit", /* 1 = _exit */ "fork", /* 2 = fork */ "read", /* 3 = read */ "write", /* 4 = write */ diff --git a/sys/compat/freebsd32/freebsd32_sysent.c b/sys/compat/freebsd32/freebsd32_sysent.c index ef0aff8bf852..1a4b0d87722c 100644 --- a/sys/compat/freebsd32/freebsd32_sysent.c +++ b/sys/compat/freebsd32/freebsd32_sysent.c @@ -68,7 +68,7 @@ /* The casts are bogus but will do for now. */ struct sysent freebsd32_sysent[] = { { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 0 = syscall */ - { .sy_narg = AS(exit_args), .sy_call = (sy_call_t *)sys_exit, .sy_auevent = AUE_EXIT, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 1 = exit */ + { .sy_narg = AS(_exit_args), .sy_call = (sy_call_t *)sys__exit, .sy_auevent = AUE_EXIT, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 1 = _exit */ { .sy_narg = 0, .sy_call = (sy_call_t *)sys_fork, .sy_auevent = AUE_FORK, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 2 = fork */ { .sy_narg = AS(read_args), .sy_call = (sy_call_t *)sys_read, .sy_auevent = AUE_READ, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 3 = read */ { .sy_narg = AS(write_args), .sy_call = (sy_call_t *)sys_write, .sy_auevent = AUE_WRITE, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 4 = write */ diff --git a/sys/compat/freebsd32/freebsd32_systrace_args.c b/sys/compat/freebsd32/freebsd32_systrace_args.c index df445b15f86f..f9dc514bee7d 100644 --- a/sys/compat/freebsd32/freebsd32_systrace_args.c +++ b/sys/compat/freebsd32/freebsd32_systrace_args.c @@ -20,9 +20,9 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 0; break; } - /* exit */ + /* _exit */ case 1: { - struct exit_args *p = params; + struct _exit_args *p = params; iarg[a++] = p->rval; /* int */ *n_args = 1; break; @@ -3426,7 +3426,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) /* syscall */ case 0: break; - /* exit */ + /* _exit */ case 1: switch (ndx) { case 0: @@ -9235,7 +9235,7 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) switch (sysnum) { /* syscall */ case 0: - /* exit */ + /* _exit */ case 1: if (ndx == 0 || ndx == 1) p = "void"; diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c index 91792430d24c..c0a5479c9634 100644 --- a/sys/kern/init_sysent.c +++ b/sys/kern/init_sysent.c @@ -67,7 +67,7 @@ /* The casts are bogus but will do for now. */ struct sysent sysent[] = { { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 0 = syscall */ - { .sy_narg = AS(exit_args), .sy_call = (sy_call_t *)sys_exit, .sy_auevent = AUE_EXIT, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 1 = exit */ + { .sy_narg = AS(_exit_args), .sy_call = (sy_call_t *)sys__exit, .sy_auevent = AUE_EXIT, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 1 = _exit */ { .sy_narg = 0, .sy_call = (sy_call_t *)sys_fork, .sy_auevent = AUE_FORK, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 2 = fork */ { .sy_narg = AS(read_args), .sy_call = (sy_call_t *)sys_read, .sy_auevent = AUE_READ, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 3 = read */ { .sy_narg = AS(write_args), .sy_call = (sy_call_t *)sys_write, .sy_auevent = AUE_WRITE, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 4 = write */ diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c index 90a4f3a7dad8..09bf4d519927 100644 --- a/sys/kern/syscalls.c +++ b/sys/kern/syscalls.c @@ -6,7 +6,7 @@ const char *syscallnames[] = { "syscall", /* 0 = syscall */ - "exit", /* 1 = exit */ + "_exit", /* 1 = _exit */ "fork", /* 2 = fork */ "read", /* 3 = read */ "write", /* 4 = write */ diff --git a/sys/kern/systrace_args.c b/sys/kern/systrace_args.c index 467caa71f20d..4dfc63924da9 100644 --- a/sys/kern/systrace_args.c +++ b/sys/kern/systrace_args.c @@ -17,9 +17,9 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 0; break; } - /* exit */ + /* _exit */ case 1: { - struct exit_args *p = params; + struct _exit_args *p = params; iarg[a++] = p->rval; /* int */ *n_args = 1; break; @@ -3513,7 +3513,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) /* syscall */ case 0: break; - /* exit */ + /* _exit */ case 1: switch (ndx) { case 0: @@ -9380,7 +9380,7 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) switch (sysnum) { /* syscall */ case 0: - /* exit */ + /* _exit */ case 1: if (ndx == 0 || ndx == 1) p = "void"; diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h index eec923d0b82e..d703a11fda01 100644 --- a/sys/sys/syscall.h +++ b/sys/sys/syscall.h @@ -4,8 +4,10 @@ * DO NOT EDIT-- this file is automatically @generated. */ +#define SYS_exit SYS__exit + #define SYS_syscall 0 -#define SYS_exit 1 +#define SYS__exit 1 #define SYS_fork 2 #define SYS_read 3 #define SYS_write 4 diff --git a/sys/sys/syscall.mk b/sys/sys/syscall.mk index 547242a73277..b7ded62cacb4 100644 --- a/sys/sys/syscall.mk +++ b/sys/sys/syscall.mk @@ -6,7 +6,7 @@ MIASM = \ syscall.o \ - exit.o \ + _exit.o \ fork.o \ read.o \ write.o \ diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h index c7420ac6bb8c..8d666f9c8ee9 100644 --- a/sys/sys/sysproto.h +++ b/sys/sys/sysproto.h @@ -33,7 +33,7 @@ struct thread; #define PADR_(t) 0 #endif -struct exit_args { +struct _exit_args { char rval_l_[PADL_(int)]; int rval; char rval_r_[PADR_(int)]; }; struct fork_args { @@ -1901,7 +1901,7 @@ struct inotify_rm_watch_args { char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; char wd_l_[PADL_(int)]; int wd; char wd_r_[PADR_(int)]; }; -int sys_exit(struct thread *, struct exit_args *); +int sys__exit(struct thread *, struct _exit_args *); int sys_fork(struct thread *, struct fork_args *); int sys_read(struct thread *, struct read_args *); int sys_write(struct thread *, struct write_args *); @@ -2802,7 +2802,7 @@ int freebsd13_swapoff(struct thread *, struct freebsd13_swapoff_args *); #endif /* COMPAT_FREEBSD14 */ -#define SYS_AUE_exit AUE_EXIT +#define SYS_AUE__exit AUE_EXIT #define SYS_AUE_fork AUE_FORK #define SYS_AUE_read AUE_READ #define SYS_AUE_write AUE_WRITE