git: a53e3f3bf2bc - stable/13 - Revert "linux32: add a hack to avoid redefining the type of the savefpu tag"

The branch stable/13 has been updated by kib:

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

commit a53e3f3bf2bc5a31f281751a3ed46755a05247d6
Author:     Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2021-09-22 18:54:39 +0000
Commit:     Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2021-10-10 09:21:17 +0000

    Revert "linux32: add a hack to avoid redefining the type of the savefpu tag"
    
    (cherry picked from commit e36d0e86e3282cde5a12b6a623e6deefaabfd0c4)
---
 sys/amd64/include/proc.h | 2 +-
 sys/x86/include/fpu.h    | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/sys/amd64/include/proc.h b/sys/amd64/include/proc.h
index a55a8d9343e7..507529f6506b 100644
--- a/sys/amd64/include/proc.h
+++ b/sys/amd64/include/proc.h
@@ -75,7 +75,7 @@ struct mdthread {
 	int	md_efirt_dis_pf;	/* (k) */
 	struct pcb md_pcb;
 	vm_offset_t md_stack_base;
-	struct savefpu *md_usr_fpu_save;
+	void *md_usr_fpu_save;
 };
 
 struct mdproc {
diff --git a/sys/x86/include/fpu.h b/sys/x86/include/fpu.h
index bb8533d599dd..313a03ea55c9 100644
--- a/sys/x86/include/fpu.h
+++ b/sys/x86/include/fpu.h
@@ -123,12 +123,10 @@ struct savexmm {
 } __aligned(16);
 
 #ifdef __i386__
-#ifndef __M32_BROKEN_MODULE_HACK__
 union savefpu {
 	struct save87	sv_87;
 	struct savexmm	sv_xmm;
 };
-#endif /* __M32_BROKEN_MODULE_HACK__ */
 #else
 /* Floating point context. (amd64 fxsave/fxrstor) */
 struct savefpu {