git: efdb03e9a9ac - main - Rename struct sigframe4 to struct freebsd4_sigframe.

The branch main has been updated by jhb:

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

commit efdb03e9a9acf5d4fc12aad2505ea0b5099cb061
Author:     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2022-01-14 01:16:50 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
CommitDate: 2022-01-14 01:16:50 +0000

    Rename struct sigframe4 to struct freebsd4_sigframe.
    
    Reviewed by:    brooks, imp, kib
    Sponsored by:   The University of Cambridge, Google Inc.
    Differential Revision:  https://reviews.freebsd.org/D33881
---
 sys/i386/i386/exec_machdep.c | 8 ++++----
 sys/i386/i386/genassym.c     | 2 +-
 sys/i386/include/sigframe.h  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sys/i386/i386/exec_machdep.c b/sys/i386/i386/exec_machdep.c
index 469b0ebc9a78..a91595c0e969 100644
--- a/sys/i386/i386/exec_machdep.c
+++ b/sys/i386/i386/exec_machdep.c
@@ -256,7 +256,7 @@ osendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask)
 static void
 freebsd4_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask)
 {
-	struct sigframe4 sf, *sfp;
+	struct freebsd4_sigframe sf, *sfp;
 	struct proc *p;
 	struct thread *td;
 	struct sigacts *psp;
@@ -291,13 +291,13 @@ freebsd4_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)) {
-		sfp = (struct sigframe4 *)((uintptr_t)td->td_sigstk.ss_sp +
-		    td->td_sigstk.ss_size - sizeof(struct sigframe4));
+		sfp = (struct freebsd4_sigframe *)((uintptr_t)td->td_sigstk.ss_sp +
+		    td->td_sigstk.ss_size - sizeof(struct freebsd4_sigframe));
 #if defined(COMPAT_43)
 		td->td_sigstk.ss_flags |= SS_ONSTACK;
 #endif
 	} else
-		sfp = (struct sigframe4 *)regs->tf_esp - 1;
+		sfp = (struct freebsd4_sigframe *)regs->tf_esp - 1;
 
 	/* Build the argument list for the signal handler. */
 	sf.sf_signum = sig;
diff --git a/sys/i386/i386/genassym.c b/sys/i386/i386/genassym.c
index bde452b44c95..55406cdd6b97 100644
--- a/sys/i386/i386/genassym.c
+++ b/sys/i386/i386/genassym.c
@@ -162,7 +162,7 @@ ASSYM(SIGF_SC, offsetof(struct osigframe, sf_siginfo.si_sc));
 #endif
 ASSYM(SIGF_UC, offsetof(struct sigframe, sf_uc));
 #ifdef COMPAT_FREEBSD4
-ASSYM(SIGF_UC4, offsetof(struct sigframe4, sf_uc));
+ASSYM(SIGF_UC4, offsetof(struct freebsd4_sigframe, sf_uc));
 #endif
 #ifdef COMPAT_43
 ASSYM(SC_PS, offsetof(struct osigcontext, sc_ps));
diff --git a/sys/i386/include/sigframe.h b/sys/i386/include/sigframe.h
index 0f07b998cf91..d5e2b1cc0678 100644
--- a/sys/i386/include/sigframe.h
+++ b/sys/i386/include/sigframe.h
@@ -75,7 +75,7 @@ struct osigframe {
 #endif
 #ifdef COMPAT_FREEBSD4
 /* FreeBSD 4.x */
-struct sigframe4 {
+struct freebsd4_sigframe {
 	register_t	sf_signum;
 	register_t	sf_siginfo;	/* code or pointer to sf_si */
 	register_t	sf_ucontext;	/* points to sf_uc */