From nobody Thu Jun 29 08:20:32 2023 X-Original-To: dev-commits-src-branches@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 4QsBGT1Gkkz4kntr; Thu, 29 Jun 2023 08:20:33 +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 4QsBGS3Sbzz3vTx; Thu, 29 Jun 2023 08:20:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688026832; 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=7gtkhJjd1vdbvowMpoFnzZ/fEF7/Oewg7KIiYYDuXcw=; b=N5AYtZGibPQRDI+pwjhe/ORRNyzNi5Q5xbOam1MpEod4bYTSDSIi/QcAznwVc9XiuprUCk A6h1MZuQ+7wudqMGomDRDumptSWvRtFwzqo+9qz6d3c6LkgPTnEli618oxNCap5akSatHZ OqUBhunm9iNwtHLIT8fQ+zDIA91+1fYgig9NFPKJD6PgMw4Y4bcCvrTyk4IKUqEzmlEnKB 2m2Ryr9DjPvD76v1RDZOOVPfk9W+RkogfZThE76ViC0SfboGxKVzq4cmgny6rmVNwKlkDD 0g7cXj256i4MV19x/TH87/JWZ2F9CyzbviglYI2VY+185FQyi2sLkqvFmM0kfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688026832; 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=7gtkhJjd1vdbvowMpoFnzZ/fEF7/Oewg7KIiYYDuXcw=; b=MGEHktQ4ZaG5+EcwAl07OX1jGxYqDsRfjZA+I+eVFz535OeAg3QtgZXFui1QYJT01APmKq TqQhfy/PfoZBNvNhSZU3mHk8jcLxiHtbhr2/Tk2kKCMxAdhlfP0MLGzdwTvPeE279awUm1 j8Ahcm4BibehiPceekjLHGHhtrJSmmiX6WGwFX8lq0oNixhWjkfKUGSdwdGg3edI0vSJrd 8z9rs/opaUOwYnFQBN2XwtADLGdvi8qdiT+KVpbM5qcNo+oZuRdSDEp1PZWOLf2CDTeRoY l+jx8tVlprdeQHk1sXFE97VgVgCtZZfRcVGVxcp3dp04to2CPTP53saUpcEOmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688026832; a=rsa-sha256; cv=none; b=vWAI9q93GaedDX+RN5LuLmPwa4Wa+f6i1I3eVlmmZkkIYVxDDfhys6P99HVXnGzYFvyWI2 Ub58Fg1Eq+JdsilIPtYBQta528Oqdcb6Tl0UOblf74ABPy235JUFf9htxliOFZw/pLKIgl tzHmdR7Le2bRmueVr7kf8ThCycPuWosyt2sT+Mh+yL6Mz/FCFnF1W/poouHxsIAv0ssRxE RNKvYLd6NL44adbYKYD4Xwn6UJtkcJkbQqq6drg6F3ftDfOvkq19d39k7JBL69+Qpxoekb DaujVdTgPBsRErtyn7S3nulVnCLWNAumVWTceFSRZaHVZ1dJuMzkj4yQw0sQVg== 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 4QsBGS2ZGxz181f; Thu, 29 Jun 2023 08:20:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 35T8KW6s083560; Thu, 29 Jun 2023 08:20:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 35T8KWJA083559; Thu, 29 Jun 2023 08:20:32 GMT (envelope-from git) Date: Thu, 29 Jun 2023 08:20:32 GMT Message-Id: <202306290820.35T8KWJA083559@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 8975a63ad5c2 - stable/13 - ktrace: Simplify ae6ac587, drop the sa var declaration List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 8975a63ad5c283a0a7ca05964826b2db799a79d2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=8975a63ad5c283a0a7ca05964826b2db799a79d2 commit 8975a63ad5c283a0a7ca05964826b2db799a79d2 Author: Dmitry Chagin AuthorDate: 2023-05-16 19:46:26 +0000 Commit: Dmitry Chagin CommitDate: 2023-06-29 08:15:58 +0000 ktrace: Simplify ae6ac587, drop the sa var declaration Suggested by: kib MFC after: 5 days (cherry picked from commit 0282f87530b33ebba890794b07f75a2874357e3a) --- 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 eebe2e2259f2..2d7e7bc0de4a 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -1118,9 +1118,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; @@ -1163,9 +1160,7 @@ 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 }