From nobody Tue Apr 4 13:19:31 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 4PrSz83qfNz43Yky; Tue, 4 Apr 2023 13:19:32 +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 4PrSz80fpvz4QfQ; Tue, 4 Apr 2023 13:19:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680614372; 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=n7zebUuv2aKXQT6jMOzG9k+uKO1W8goh66ZkrPErPWY=; b=M6p5Kd97X7f/E9mBAeAlBQ2NJ8Urud36YFnCr8Hoas7VBxBQBpT1+J1I3u2JzcWNYxT7fK XdKWKWE7K6X6kBVggYbGHdcHJ8SPhiC+YXhmh1LKG2CtnrnI9q41lkDCQZVzJ4yLDXe9x5 obT2d78LXGgqy2P94ZrO4bUpmqU2D3P4tOUDXUMLFopsjfAQ+MaXBz4sd7FXWKd9An8XuM KKhYz8RCqFn5qm8vQMcbkCiU8U07yDcE8f2PkjGQq0HcxTK3/2A6dDBQSyWZEbmj4l/yxg XZhJXG3heUwdSxmO4amOvy/cRsPvlylvsfo8Rw7s+zsE3fRZPEyO0ZIe5deygA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680614372; 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=n7zebUuv2aKXQT6jMOzG9k+uKO1W8goh66ZkrPErPWY=; b=n8c3kBiqwCAhQztZZDDBKSPeCo2QfruVExAEGfJTd1aQDpHpgr3G8ebXVe03BvT4ANOgFF j98/vWbSD9b+ZzhdqjwTFQN+gKYVwJ1+sk2mLWOKCQeOpIzjeYVmBMN2hNZPIN9JEGiJs1 BQZ/Ea6MpnF8Q28RtfPdayQNvDyZ9IlwnvAoaO9YY+U2ImNhJlpQc7fI/FpX4md7AWWP4k fG+ff8Aj+YFU9kx47dnZrg/QC9fdpXvSWw+seByAixOawdWUTTwsxhs0HOf5+qBwtBSV2Y hVQmBIxK3kcB805dsOI+HSPBdOl4rDoU8R7GjnhoqD6Aq/rYM6MM78YnjizH/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680614372; a=rsa-sha256; cv=none; b=gUbf8rSL4bTFZLF5WxjekEn4gp0QIoyQfOi33HbmTgPveiX4X8JLr+heDOC1NMqLIZMgQj S5zXSmAfxvDAjzpR1O/ZKkDoIXshBwj5f6QpHSM/YdKPpooTX1K8q0uuaeuYvO9HywZTws Dv0gXXO2SaFxZ08Vh0Ulnaka00hf7UywM0H7maMybVPWDYAWxdeqQ3I0FpwB0xwJkKS/CN G6LtEwMJM5QCXQZnPh0NuFd/fi5pI567fDZd9CHOxcR4kFlDxlhl8mhbDr8YQaTr8U9sNL RlnewwFFkZePBlMkSY+oxvcniGbN3aSxFJloZ5y9q+/wPBBgNske9XElN4A87A== 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 4PrSz76t66zhHL; Tue, 4 Apr 2023 13:19:31 +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 334DJVE1084877; Tue, 4 Apr 2023 13:19:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 334DJVK7084876; Tue, 4 Apr 2023 13:19:31 GMT (envelope-from git) Date: Tue, 4 Apr 2023 13:19:31 GMT Message-Id: <202304041319.334DJVK7084876@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 11cdffc60325 - main - Regen 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 11cdffc60325580d55e0ab835429d3fda2cbc8fb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=11cdffc60325580d55e0ab835429d3fda2cbc8fb commit 11cdffc60325580d55e0ab835429d3fda2cbc8fb Author: Konstantin Belousov AuthorDate: 2023-03-31 22:28:25 +0000 Commit: Konstantin Belousov CommitDate: 2023-04-04 13:19:08 +0000 Regen --- 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 | 2 +- sys/sys/syscall.mk | 2 +- sys/sys/sysproto.h | 6 +++--- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32_syscall.h b/sys/compat/freebsd32/freebsd32_syscall.h index 604a41ad80ed..c8815aa0a67b 100644 --- a/sys/compat/freebsd32/freebsd32_syscall.h +++ b/sys/compat/freebsd32/freebsd32_syscall.h @@ -501,5 +501,5 @@ #define FREEBSD32_SYS_fspacectl 580 #define FREEBSD32_SYS_sched_getcpu 581 #define FREEBSD32_SYS_swapoff 582 -#define FREEBSD32_SYS_kqueue1 583 +#define FREEBSD32_SYS_kqueuex 583 #define FREEBSD32_SYS_MAXSYSCALL 584 diff --git a/sys/compat/freebsd32/freebsd32_syscalls.c b/sys/compat/freebsd32/freebsd32_syscalls.c index 512cee44bfd8..67db3b5dffe9 100644 --- a/sys/compat/freebsd32/freebsd32_syscalls.c +++ b/sys/compat/freebsd32/freebsd32_syscalls.c @@ -589,5 +589,5 @@ const char *freebsd32_syscallnames[] = { "fspacectl", /* 580 = fspacectl */ "sched_getcpu", /* 581 = sched_getcpu */ "swapoff", /* 582 = swapoff */ - "kqueue1", /* 583 = kqueue1 */ + "kqueuex", /* 583 = kqueuex */ }; diff --git a/sys/compat/freebsd32/freebsd32_sysent.c b/sys/compat/freebsd32/freebsd32_sysent.c index 172138cc3d99..e3574d407336 100644 --- a/sys/compat/freebsd32/freebsd32_sysent.c +++ b/sys/compat/freebsd32/freebsd32_sysent.c @@ -645,5 +645,5 @@ struct sysent freebsd32_sysent[] = { { .sy_narg = AS(fspacectl_args), .sy_call = (sy_call_t *)sys_fspacectl, .sy_auevent = AUE_FSPACECTL, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 580 = fspacectl */ { .sy_narg = 0, .sy_call = (sy_call_t *)sys_sched_getcpu, .sy_auevent = AUE_NULL, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 581 = sched_getcpu */ { .sy_narg = AS(swapoff_args), .sy_call = (sy_call_t *)sys_swapoff, .sy_auevent = AUE_SWAPOFF, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 582 = swapoff */ - { .sy_narg = AS(kqueue1_args), .sy_call = (sy_call_t *)sys_kqueue1, .sy_auevent = AUE_KQUEUE, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 583 = kqueue1 */ + { .sy_narg = AS(kqueuex_args), .sy_call = (sy_call_t *)sys_kqueuex, .sy_auevent = AUE_KQUEUE, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 583 = kqueuex */ }; diff --git a/sys/compat/freebsd32/freebsd32_systrace_args.c b/sys/compat/freebsd32/freebsd32_systrace_args.c index 0436fc807ea2..6de26d4f6ba4 100644 --- a/sys/compat/freebsd32/freebsd32_systrace_args.c +++ b/sys/compat/freebsd32/freebsd32_systrace_args.c @@ -3321,9 +3321,9 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 2; break; } - /* kqueue1 */ + /* kqueuex */ case 583: { - struct kqueue1_args *p = params; + struct kqueuex_args *p = params; uarg[a++] = p->flags; /* u_int */ *n_args = 1; break; @@ -8971,7 +8971,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; - /* kqueue1 */ + /* kqueuex */ case 583: switch (ndx) { case 0: @@ -10839,7 +10839,7 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) if (ndx == 0 || ndx == 1) p = "int"; break; - /* kqueue1 */ + /* kqueuex */ case 583: if (ndx == 0 || ndx == 1) p = "int"; diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c index 6d0db175ecd2..b7709bbc9fcb 100644 --- a/sys/kern/init_sysent.c +++ b/sys/kern/init_sysent.c @@ -644,5 +644,5 @@ struct sysent sysent[] = { { .sy_narg = AS(fspacectl_args), .sy_call = (sy_call_t *)sys_fspacectl, .sy_auevent = AUE_FSPACECTL, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 580 = fspacectl */ { .sy_narg = 0, .sy_call = (sy_call_t *)sys_sched_getcpu, .sy_auevent = AUE_NULL, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 581 = sched_getcpu */ { .sy_narg = AS(swapoff_args), .sy_call = (sy_call_t *)sys_swapoff, .sy_auevent = AUE_SWAPOFF, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 582 = swapoff */ - { .sy_narg = AS(kqueue1_args), .sy_call = (sy_call_t *)sys_kqueue1, .sy_auevent = AUE_KQUEUE, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 583 = kqueue1 */ + { .sy_narg = AS(kqueuex_args), .sy_call = (sy_call_t *)sys_kqueuex, .sy_auevent = AUE_KQUEUE, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 583 = kqueuex */ }; diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c index 88b6dfe2f602..bf6281ad38ae 100644 --- a/sys/kern/syscalls.c +++ b/sys/kern/syscalls.c @@ -589,5 +589,5 @@ const char *syscallnames[] = { "fspacectl", /* 580 = fspacectl */ "sched_getcpu", /* 581 = sched_getcpu */ "swapoff", /* 582 = swapoff */ - "kqueue1", /* 583 = kqueue1 */ + "kqueuex", /* 583 = kqueuex */ }; diff --git a/sys/kern/systrace_args.c b/sys/kern/systrace_args.c index a278632e1d79..47d8286af150 100644 --- a/sys/kern/systrace_args.c +++ b/sys/kern/systrace_args.c @@ -3417,9 +3417,9 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 2; break; } - /* kqueue1 */ + /* kqueuex */ case 583: { - struct kqueue1_args *p = params; + struct kqueuex_args *p = params; uarg[a++] = p->flags; /* u_int */ *n_args = 1; break; @@ -9141,7 +9141,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; - /* kqueue1 */ + /* kqueuex */ case 583: switch (ndx) { case 0: @@ -11104,7 +11104,7 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) if (ndx == 0 || ndx == 1) p = "int"; break; - /* kqueue1 */ + /* kqueuex */ case 583: if (ndx == 0 || ndx == 1) p = "int"; diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h index 2378497a96c0..0e725febf183 100644 --- a/sys/sys/syscall.h +++ b/sys/sys/syscall.h @@ -520,5 +520,5 @@ #define SYS_fspacectl 580 #define SYS_sched_getcpu 581 #define SYS_swapoff 582 -#define SYS_kqueue1 583 +#define SYS_kqueuex 583 #define SYS_MAXSYSCALL 584 diff --git a/sys/sys/syscall.mk b/sys/sys/syscall.mk index 10093a5f4942..946f33dfa748 100644 --- a/sys/sys/syscall.mk +++ b/sys/sys/syscall.mk @@ -426,4 +426,4 @@ MIASM = \ fspacectl.o \ sched_getcpu.o \ swapoff.o \ - kqueue1.o + kqueuex.o diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h index e3c7b473258a..5cb69f8d59d3 100644 --- a/sys/sys/sysproto.h +++ b/sys/sys/sysproto.h @@ -1855,7 +1855,7 @@ struct swapoff_args { char name_l_[PADL_(const char *)]; const char * name; char name_r_[PADR_(const char *)]; char flags_l_[PADL_(u_int)]; u_int flags; char flags_r_[PADR_(u_int)]; }; -struct kqueue1_args { +struct kqueuex_args { char flags_l_[PADL_(u_int)]; u_int flags; char flags_r_[PADR_(u_int)]; }; int sys_exit(struct thread *, struct exit_args *); @@ -2253,7 +2253,7 @@ int sys_aio_readv(struct thread *, struct aio_readv_args *); int sys_fspacectl(struct thread *, struct fspacectl_args *); int sys_sched_getcpu(struct thread *, struct sched_getcpu_args *); int sys_swapoff(struct thread *, struct swapoff_args *); -int sys_kqueue1(struct thread *, struct kqueue1_args *); +int sys_kqueuex(struct thread *, struct kqueuex_args *); #ifdef COMPAT_43 @@ -3223,7 +3223,7 @@ int freebsd13_swapoff(struct thread *, struct freebsd13_swapoff_args *); #define SYS_AUE_fspacectl AUE_FSPACECTL #define SYS_AUE_sched_getcpu AUE_NULL #define SYS_AUE_swapoff AUE_SWAPOFF -#define SYS_AUE_kqueue1 AUE_KQUEUE +#define SYS_AUE_kqueuex AUE_KQUEUE #undef PAD_ #undef PADL_