From 949fb4f9627b2727e4e3775d24dbc76638e885de Mon Sep 17 00:00:00 2001
From: Mark Johnston <markj@FreeBSD.org>
Date: Tue, 1 Jun 2021 10:28:57 -0400
Subject: [PATCH] i386: Make setidt_disp a size_t instead of uintptr_t

setidt_disp is the offset of the ISR trampoline relative to the address
of the routines in exception.s, so uintptr_t is not quite right.

Also remove a bogus declaration I added in commit 18f55c67f7, it is not
required after all.

Reported by:	jrtc27
Reviewed by:	jrtc27, kib
Sponsored by:	The FreeBSD Foundation

(cherry picked from commit cbe59a6475b6c36fac4073bcfc328099fc873420)
---
 sys/i386/i386/machdep.c   | 2 +-
 sys/i386/include/md_var.h | 2 +-
 sys/x86/x86/local_apic.c  | 4 ----
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index 888550eab6a..6b622c82626 100644
--- a/sys/i386/i386/machdep.c
+++ b/sys/i386/i386/machdep.c
@@ -1514,7 +1514,7 @@ static struct soft_segment_descriptor ldt_segs[] = {
 	.ssd_gran = 1		},
 };
 
-uintptr_t setidt_disp;
+size_t setidt_disp;
 
 void
 setidt(int idx, inthand_t *func, int typ, int dpl, int selec)
diff --git a/sys/i386/include/md_var.h b/sys/i386/include/md_var.h
index c41de85b9bc..95f4907a61d 100644
--- a/sys/i386/include/md_var.h
+++ b/sys/i386/include/md_var.h
@@ -48,7 +48,7 @@ extern	int	szosigcode;
 extern	int	sz_lcall_tramp;
 #endif
 extern  vm_offset_t proc0kstack;
-extern	uintptr_t setidt_disp;
+extern	size_t setidt_disp;
 
 struct	segment_descriptor;
 union savefpu;
diff --git a/sys/x86/x86/local_apic.c b/sys/x86/x86/local_apic.c
index 28443c43cfc..ee549559f5b 100644
--- a/sys/x86/x86/local_apic.c
+++ b/sys/x86/x86/local_apic.c
@@ -2115,10 +2115,6 @@ native_lapic_ipi_vectored(u_int vector, int dest)
 
 #endif /* SMP */
 
-#ifdef __i386__
-extern uintptr_t setidt_disp;
-#endif
-
 /*
  * Since the IDT is shared by all CPUs the IPI slot update needs to be globally
  * visible.