Always export r_gdt and r_idt and give them extern declarations in

machine/segments.h.

8 files changed, 2 insertions, 26 deletions

diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c
index deb79a7..6810a1a 100644
--- a/sys/amd64/amd64/mp_machdep.c
+++ b/sys/amd64/amd64/mp_machdep.c
@@ -250,9 +250,6 @@ static struct mtx ap_boot_mtx;
 /** XXX FIXME: where does this really belong, isa.h/isa.c perhaps? */
 int	current_postcode;
 
-/** XXX FIXME: what system files declare these??? */
-extern struct region_descriptor r_gdt, r_idt;
-
 int	bsp_apic_ready = 0;	/* flags useability of BSP apic */
 int	mp_naps;		/* # of Applications processors */
 int	mp_nbusses;		/* # of busses */
diff --git a/sys/amd64/amd64/mptable.c b/sys/amd64/amd64/mptable.c
index deb79a7..6810a1a 100644
--- a/sys/amd64/amd64/mptable.c
+++ b/sys/amd64/amd64/mptable.c
@@ -250,9 +250,6 @@ static struct mtx ap_boot_mtx;
 /** XXX FIXME: where does this really belong, isa.h/isa.c perhaps? */
 int	current_postcode;
 
-/** XXX FIXME: what system files declare these??? */
-extern struct region_descriptor r_gdt, r_idt;
-
 int	bsp_apic_ready = 0;	/* flags useability of BSP apic */
 int	mp_naps;		/* # of Applications processors */
 int	mp_nbusses;		/* # of busses */
diff --git a/sys/amd64/include/mptable.h b/sys/amd64/include/mptable.h
index deb79a7..6810a1a 100644
--- a/sys/amd64/include/mptable.h
+++ b/sys/amd64/include/mptable.h
@@ -250,9 +250,6 @@ static struct mtx ap_boot_mtx;
 /** XXX FIXME: where does this really belong, isa.h/isa.c perhaps? */
 int	current_postcode;
 
-/** XXX FIXME: what system files declare these??? */
-extern struct region_descriptor r_gdt, r_idt;
-
 int	bsp_apic_ready = 0;	/* flags useability of BSP apic */
 int	mp_naps;		/* # of Applications processors */
 int	mp_nbusses;		/* # of busses */
diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index e2ceead..2e1b4e1 100644
--- a/sys/i386/i386/machdep.c
+++ b/sys/i386/i386/machdep.c
@@ -1225,10 +1225,7 @@ union descriptor gdt[NGDT * MAXCPU];	/* global descriptor table */
 static struct gate_descriptor idt0[NIDT];
 struct gate_descriptor *idt = &idt0[0];	/* interrupt descriptor table */
 union descriptor ldt[NLDT];		/* local descriptor table */
-#ifdef SMP
-/* table descriptors - used to load tables by microp */
-struct region_descriptor r_gdt, r_idt;
-#endif
+struct region_descriptor r_gdt, r_idt;	/* table descriptors */
 
 int private_tss;			/* flag indicating private tss */
 
@@ -1922,10 +1919,6 @@ init386(first)
 {
 	struct gate_descriptor *gdp;
 	int gsel_tss, metadata_missing, off, x;
-#ifndef SMP
-	/* table descriptors - used to load tables by microp */
-	struct region_descriptor r_gdt, r_idt;
-#endif
 	struct pcpu *pc;
 
 	proc0.p_uarea = proc0uarea;
diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c
index deb79a7..6810a1a 100644
--- a/sys/i386/i386/mp_machdep.c
+++ b/sys/i386/i386/mp_machdep.c
@@ -250,9 +250,6 @@ static struct mtx ap_boot_mtx;
 /** XXX FIXME: where does this really belong, isa.h/isa.c perhaps? */
 int	current_postcode;
 
-/** XXX FIXME: what system files declare these??? */
-extern struct region_descriptor r_gdt, r_idt;
-
 int	bsp_apic_ready = 0;	/* flags useability of BSP apic */
 int	mp_naps;		/* # of Applications processors */
 int	mp_nbusses;		/* # of busses */
diff --git a/sys/i386/i386/mptable.c b/sys/i386/i386/mptable.c
index deb79a7..6810a1a 100644
--- a/sys/i386/i386/mptable.c
+++ b/sys/i386/i386/mptable.c
@@ -250,9 +250,6 @@ static struct mtx ap_boot_mtx;
 /** XXX FIXME: where does this really belong, isa.h/isa.c perhaps? */
 int	current_postcode;
 
-/** XXX FIXME: what system files declare these??? */
-extern struct region_descriptor r_gdt, r_idt;
-
 int	bsp_apic_ready = 0;	/* flags useability of BSP apic */
 int	mp_naps;		/* # of Applications processors */
 int	mp_nbusses;		/* # of busses */
diff --git a/sys/i386/include/mptable.h b/sys/i386/include/mptable.h
index deb79a7..6810a1a 100644
--- a/sys/i386/include/mptable.h
+++ b/sys/i386/include/mptable.h
@@ -250,9 +250,6 @@ static struct mtx ap_boot_mtx;
 /** XXX FIXME: where does this really belong, isa.h/isa.c perhaps? */
 int	current_postcode;
 
-/** XXX FIXME: what system files declare these??? */
-extern struct region_descriptor r_gdt, r_idt;
-
 int	bsp_apic_ready = 0;	/* flags useability of BSP apic */
 int	mp_naps;		/* # of Applications processors */
 int	mp_nbusses;		/* # of busses */
diff --git a/sys/i386/include/segments.h b/sys/i386/include/segments.h
index 1877b07..036737c 100644
--- a/sys/i386/include/segments.h
+++ b/sys/i386/include/segments.h
@@ -245,6 +245,7 @@ extern union descriptor gdt[];
 extern struct soft_segment_descriptor gdt_segs[];
 extern struct gate_descriptor *idt;
 extern union descriptor ldt[NLDT];
+extern struct region_descriptor r_gdt, r_idt;
 
 void	lgdt(struct region_descriptor *rdp);
 void	sdtossd(struct segment_descriptor *sdp,