git: 0aa326f7b384 - stable/13 - linux(4) rt_sendsig: Remove the use of caddr_t

From: Dmitry Chagin <dchagin_at_FreeBSD.org>
Date: Thu, 29 Jun 2023 08:20:49 UTC
The branch stable/13 has been updated by dchagin:

URL: https://cgit.FreeBSD.org/src/commit/?id=0aa326f7b3842178986a3c7a8889965505c61856

commit 0aa326f7b3842178986a3c7a8889965505c61856
Author:     Dmitry Chagin <dchagin@FreeBSD.org>
AuthorDate: 2023-06-06 20:01:39 +0000
Commit:     Dmitry Chagin <dchagin@FreeBSD.org>
CommitDate: 2023-06-29 08:16:02 +0000

    linux(4) rt_sendsig: Remove the use of caddr_t
    
    Replace caddr_t by more appropriate char *.
    
    MFC after:              2 weeks
    
    (cherry picked from commit 84617f6fccd45505f3eeebad1c8cdce1140b7f8e)
---
 sys/amd64/linux/linux_sysvec.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys/amd64/linux/linux_sysvec.c b/sys/amd64/linux/linux_sysvec.c
index 53eda1cbc7c0..2383a4dd6632 100644
--- a/sys/amd64/linux/linux_sysvec.c
+++ b/sys/amd64/linux/linux_sysvec.c
@@ -409,7 +409,7 @@ linux_rt_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask)
 	struct proc *p;
 	struct thread *td;
 	struct sigacts *psp;
-	caddr_t sp;
+	char *sp;
 	struct trapframe *regs;
 	struct savefpu *svfp;
 	mcontext_t mc;
@@ -439,9 +439,9 @@ linux_rt_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask)
 	/* Allocate space for the signal handler context. */
 	if ((td->td_pflags & TDP_ALTSTACK) != 0 && !oonstack &&
 	    SIGISMEMBER(psp->ps_sigonstack, sig)) {
-		sp = (caddr_t)td->td_sigstk.ss_sp + td->td_sigstk.ss_size;
+		sp = (char *)td->td_sigstk.ss_sp + td->td_sigstk.ss_size;
 	} else
-		sp = (caddr_t)regs->tf_rsp - 128;
+		sp = (char *)regs->tf_rsp - 128;
 
 	mtx_unlock(&psp->ps_mtx);
 	PROC_UNLOCK(p);
@@ -496,7 +496,7 @@ linux_rt_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask)
 	for (i = 0; i < nitems(svfp->sv_xmm); ++i)
 		bcopy(svfp->sv_xmm[i].xmm_bytes, &sf.sf_fs.xmm[i],
 		    sizeof(svfp->sv_xmm[i].xmm_bytes));
-	sf.sf_uc.uc_mcontext.sc_fpstate = (struct l_fpstate *)((caddr_t)sfp +
+	sf.sf_uc.uc_mcontext.sc_fpstate = (struct l_fpstate *)((char *)sfp +
 	    offsetof(struct l_rt_sigframe, sf_fs));
 
 	/* Translate the signal. */