The branch stable/13 has been updated by dchagin:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=8975a63ad5c283a0a7ca05964826b2db799a79d2

commit 8975a63ad5c283a0a7ca05964826b2db799a79d2
Author:     Dmitry Chagin <[email protected]>
AuthorDate: 2023-05-16 19:46:26 +0000
Commit:     Dmitry Chagin <[email protected]>
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
 }

Reply via email to