From nobody Tue May 16 19:46:44 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 4QLRZX5GZWz4BPVP; Tue, 16 May 2023 19:46: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QLRZX4dp5z4H1c; Tue, 16 May 2023 19:46:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684266404; 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=Zhk9nSHBJpjw0SMuKz3qf6IM4RkPEgDdo5HXKE7iGUU=; b=HwhRj4GvXtdikg+xqNxRS8W7u73KZSlmdETLU9xeAeAZi4srdpsZpLxBqGQuhUxq32IEDQ MW7soWuLRQVUzxKNm4L60ORD+I3OpHYuDQukEnXidvI2n1Fo9i2YvZtdxrAJQMY4Njio9O 4uybXSvm3hJ7yiTjemfiIuOtaxteXtWaOLMORrzs+ywyja5G/fUDFai6Yroc8EgVgdCJ58 HZXXsjc2VkCg7PHQJr82HRphBKieEzuQ3ODCmkxu6qoCSTDDGla8dijRajhwInDwWNTFNY aK12TFfoWocom8m2LJdSFVbt/I/K0VYU74tEI/ZGsZX+phl98i+r1CO0u7ifFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684266404; 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=Zhk9nSHBJpjw0SMuKz3qf6IM4RkPEgDdo5HXKE7iGUU=; b=RYmjbYpmWAvqJsputpoXSlFqpGJ3U1pJGeoauqUZaD13tQ/8nHbOQuMBxn4XpKliwoUo7+ EEVCzFnVJZzPFdScpV4amjQbuM00S/tAzWWc5nHZoH0Y3imwl4Ud7VjKlDxH0Vd6Ffsij2 ftYu/ZgUzjR5L8xtY9KF4ztdFSUmPb1cKeEQoyCqXuxRrN5ay2TfYrWyNgKI9dll3If+lo EAhS+mq/5CnoU53b8vbrUztghbRqo9byqMkOZhCeRgAzs6rHIP5Xisn9mpptPkeMwkPXGZ wn/FVlFW4sP8/PrTHhiLedR8n/0YgxigJd3XRDaWhy80Mo+NadImrP8Vzb2Jjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684266404; a=rsa-sha256; cv=none; b=T8WU0qvedLDHj4ThMQ+Zmvt0kvGP13nhAppzmobqSdHEGPaThr4Mw1Q11rdzu3vcq17wXA 5q4Ze9s4uUrW9TjECwUcXJ/tVNQbF/DCKjJM19RrQ7urBxufenoMoTSP4Sz12hxVDZx1VU uP2F9ExpwbOeLNGx34mhoqtm/7usRR0OdtUet885L8kn03hhO1+8/M9zzkAt7X0/zUSm2/ TkJE+wbsjpToM2xh8DKPDJ5bEZGRQWDej9YKh/OSySs3mHDFCZDhwz2bO/8Y4ev2P4oQPk fsF6NxyJdmZ99zDzMPfmyUUN/47+9IgYSoJGrX7ojghNcvcP6j1i5KtSeeIylA== 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 4QLRZX3jBWzZpc; Tue, 16 May 2023 19:46:44 +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 34GJkiCp039879; Tue, 16 May 2023 19:46:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34GJkif5039878; Tue, 16 May 2023 19:46:44 GMT (envelope-from git) Date: Tue, 16 May 2023 19:46:44 GMT Message-Id: <202305161946.34GJkif5039878@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 0282f87530b3 - main - ktrace: Simplify ae6ac587, drop the sa var declaration 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0282f87530b33ebba890794b07f75a2874357e3a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=0282f87530b33ebba890794b07f75a2874357e3a commit 0282f87530b33ebba890794b07f75a2874357e3a Author: Dmitry Chagin AuthorDate: 2023-05-16 19:46:26 +0000 Commit: Dmitry Chagin CommitDate: 2023-05-16 19:46:26 +0000 ktrace: Simplify ae6ac587, drop the sa var declaration Suggested by: kib MFC after: 5 days --- sys/kern/kern_fork.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index ca2357edbe36..f981747aaf70 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -1125,9 +1125,6 @@ fork_exit(void (*callout)(void *, struct trapframe *), void *arg, void fork_return(struct thread *td, struct trapframe *frame) { -#ifdef KTRACE - struct syscall_args *sa; -#endif struct proc *p; p = td->td_proc; @@ -1170,10 +1167,8 @@ fork_return(struct thread *td, struct trapframe *frame) userret(td, frame); #ifdef KTRACE - if (KTRPOINT(td, KTR_SYSRET)) { - sa = &td->td_sa; - ktrsysret(sa->code, 0, 0); - } + if (KTRPOINT(td, KTR_SYSRET)) + ktrsysret(td->td_sa.code, 0, 0); #endif }