git: 71ec998a1c94 - main - Rename struct mcontext4 to struct freebsd4_mcontext.

The branch main has been updated by jhb:

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

commit 71ec998a1c94ebf65d11e755c9e89fa65c3610fd
Author:     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2022-01-14 01:11:03 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
CommitDate: 2022-01-14 01:11:03 +0000

    Rename struct mcontext4 to struct freebsd4_mcontext.
    
    This matches the recent renaming of struct freebsd4_ucontext.
    
    Reviewed by:    brooks, imp, kib
    Sponsored by:   The University of Cambridge, Google Inc.
    Differential Revision:  https://reviews.freebsd.org/D33880
---
 sys/i386/include/ucontext.h | 2 +-
 sys/sys/ucontext.h          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/i386/include/ucontext.h b/sys/i386/include/ucontext.h
index 6a72e568c9cd..0b54b77ae144 100644
--- a/sys/i386/include/ucontext.h
+++ b/sys/i386/include/ucontext.h
@@ -34,7 +34,7 @@
 #define	_MACHINE_UCONTEXT_H_
 
 #if defined(_KERNEL) && defined(COMPAT_FREEBSD4)
-struct mcontext4 {
+struct freebsd4_mcontext {
 	__register_t	mc_onstack;	/* XXX - sigcontext compat. */
 	__register_t	mc_gs;		/* machine state (struct trapframe) */
 	__register_t	mc_fs;
diff --git a/sys/sys/ucontext.h b/sys/sys/ucontext.h
index f86258d4b1f8..8da481732c09 100644
--- a/sys/sys/ucontext.h
+++ b/sys/sys/ucontext.h
@@ -43,7 +43,7 @@
 #if defined(__i386__)
 struct freebsd4_ucontext {
 	sigset_t	uc_sigmask;
-	struct mcontext4 uc_mcontext;
+	struct freebsd4_mcontext uc_mcontext;
 	struct freebsd4_ucontext *uc_link;
 	stack_t		uc_stack;
 	int		__spare__[8];