diff --git a/sys/alpha/include/globaldata.h b/sys/alpha/include/globaldata.h
index 5fd6c5948564..127dd09f6ceb 100644
--- a/sys/alpha/include/globaldata.h
+++ b/sys/alpha/include/globaldata.h
@@ -52,7 +52,6 @@ struct globaldata {
 	int		gd_switchticks;
 	u_int		gd_cpuno;		/* this cpu number */
 	u_int		gd_other_cpus;		/* all other cpus */
-	int		gd_inside_intr;
 	u_int64_t	gd_idlepcbphys;		/* pa of gd_idlepcb */
 	u_int64_t	gd_pending_ipis;	/* pending IPI events */
 	u_int32_t	gd_next_asn;		/* next ASN to allocate */
diff --git a/sys/alpha/include/pcpu.h b/sys/alpha/include/pcpu.h
index 5fd6c5948564..127dd09f6ceb 100644
--- a/sys/alpha/include/pcpu.h
+++ b/sys/alpha/include/pcpu.h
@@ -52,7 +52,6 @@ struct globaldata {
 	int		gd_switchticks;
 	u_int		gd_cpuno;		/* this cpu number */
 	u_int		gd_other_cpus;		/* all other cpus */
-	int		gd_inside_intr;
 	u_int64_t	gd_idlepcbphys;		/* pa of gd_idlepcb */
 	u_int64_t	gd_pending_ipis;	/* pending IPI events */
 	u_int32_t	gd_next_asn;		/* next ASN to allocate */
diff --git a/sys/amd64/amd64/genassym.c b/sys/amd64/amd64/genassym.c
index 233f2f771b01..82e5a5461064 100644
--- a/sys/amd64/amd64/genassym.c
+++ b/sys/amd64/amd64/genassym.c
@@ -201,8 +201,6 @@ ASSYM(GD_KTR_BUF_DATA, offsetof(struct globaldata, gd_ktr_buf_data));
 ASSYM(GD_CPUID, offsetof(struct globaldata, gd_cpuid));
 ASSYM(GD_CPU_LOCKID, offsetof(struct globaldata, gd_cpu_lockid));
 ASSYM(GD_OTHER_CPUS, offsetof(struct globaldata, gd_other_cpus));
-ASSYM(GD_SS_EFLAGS, offsetof(struct globaldata, gd_ss_eflags));
-ASSYM(GD_INSIDE_INTR, offsetof(struct globaldata, gd_inside_intr));
 ASSYM(GD_PRV_CMAP1, offsetof(struct globaldata, gd_prv_CMAP1));
 ASSYM(GD_PRV_CMAP2, offsetof(struct globaldata, gd_prv_CMAP2));
 ASSYM(GD_PRV_CMAP3, offsetof(struct globaldata, gd_prv_CMAP3));
diff --git a/sys/amd64/include/pcpu.h b/sys/amd64/include/pcpu.h
index 173cb08264d0..4474353d3055 100644
--- a/sys/amd64/include/pcpu.h
+++ b/sys/amd64/include/pcpu.h
@@ -69,8 +69,6 @@ struct globaldata {
 	u_int		gd_cpuid;
 	u_int		gd_cpu_lockid;
 	u_int		gd_other_cpus;
-	int		gd_inside_intr;
-	u_int		gd_ss_eflags;
 	pt_entry_t	*gd_prv_CMAP1;
 	pt_entry_t	*gd_prv_CMAP2;
 	pt_entry_t	*gd_prv_CMAP3;
diff --git a/sys/i386/i386/genassym.c b/sys/i386/i386/genassym.c
index 233f2f771b01..82e5a5461064 100644
--- a/sys/i386/i386/genassym.c
+++ b/sys/i386/i386/genassym.c
@@ -201,8 +201,6 @@ ASSYM(GD_KTR_BUF_DATA, offsetof(struct globaldata, gd_ktr_buf_data));
 ASSYM(GD_CPUID, offsetof(struct globaldata, gd_cpuid));
 ASSYM(GD_CPU_LOCKID, offsetof(struct globaldata, gd_cpu_lockid));
 ASSYM(GD_OTHER_CPUS, offsetof(struct globaldata, gd_other_cpus));
-ASSYM(GD_SS_EFLAGS, offsetof(struct globaldata, gd_ss_eflags));
-ASSYM(GD_INSIDE_INTR, offsetof(struct globaldata, gd_inside_intr));
 ASSYM(GD_PRV_CMAP1, offsetof(struct globaldata, gd_prv_CMAP1));
 ASSYM(GD_PRV_CMAP2, offsetof(struct globaldata, gd_prv_CMAP2));
 ASSYM(GD_PRV_CMAP3, offsetof(struct globaldata, gd_prv_CMAP3));
diff --git a/sys/i386/include/globaldata.h b/sys/i386/include/globaldata.h
index 173cb08264d0..4474353d3055 100644
--- a/sys/i386/include/globaldata.h
+++ b/sys/i386/include/globaldata.h
@@ -69,8 +69,6 @@ struct globaldata {
 	u_int		gd_cpuid;
 	u_int		gd_cpu_lockid;
 	u_int		gd_other_cpus;
-	int		gd_inside_intr;
-	u_int		gd_ss_eflags;
 	pt_entry_t	*gd_prv_CMAP1;
 	pt_entry_t	*gd_prv_CMAP2;
 	pt_entry_t	*gd_prv_CMAP3;
diff --git a/sys/i386/include/pcpu.h b/sys/i386/include/pcpu.h
index 173cb08264d0..4474353d3055 100644
--- a/sys/i386/include/pcpu.h
+++ b/sys/i386/include/pcpu.h
@@ -69,8 +69,6 @@ struct globaldata {
 	u_int		gd_cpuid;
 	u_int		gd_cpu_lockid;
 	u_int		gd_other_cpus;
-	int		gd_inside_intr;
-	u_int		gd_ss_eflags;
 	pt_entry_t	*gd_prv_CMAP1;
 	pt_entry_t	*gd_prv_CMAP2;
 	pt_entry_t	*gd_prv_CMAP3;
diff --git a/sys/ia64/include/globaldata.h b/sys/ia64/include/globaldata.h
index eb8842260679..6068bd195ea6 100644
--- a/sys/ia64/include/globaldata.h
+++ b/sys/ia64/include/globaldata.h
@@ -51,7 +51,6 @@ struct globaldata {
 	int		gd_switchticks;
 	u_int		gd_cpuno;		/* this cpu number */
 	u_int		gd_other_cpus;		/* all other cpus */
-	int		gd_inside_intr;
 	u_int64_t	gd_idlepcbphys;		/* pa of gd_idlepcb */
 	u_int64_t	gd_pending_ipis;	/* pending IPI events */
 	struct pmap	*gd_current_pmap;	/* which pmap is active */
diff --git a/sys/ia64/include/pcpu.h b/sys/ia64/include/pcpu.h
index eb8842260679..6068bd195ea6 100644
--- a/sys/ia64/include/pcpu.h
+++ b/sys/ia64/include/pcpu.h
@@ -51,7 +51,6 @@ struct globaldata {
 	int		gd_switchticks;
 	u_int		gd_cpuno;		/* this cpu number */
 	u_int		gd_other_cpus;		/* all other cpus */
-	int		gd_inside_intr;
 	u_int64_t	gd_idlepcbphys;		/* pa of gd_idlepcb */
 	u_int64_t	gd_pending_ipis;	/* pending IPI events */
 	struct pmap	*gd_current_pmap;	/* which pmap is active */
diff --git a/sys/powerpc/include/globaldata.h b/sys/powerpc/include/globaldata.h
index 5fd6c5948564..127dd09f6ceb 100644
--- a/sys/powerpc/include/globaldata.h
+++ b/sys/powerpc/include/globaldata.h
@@ -52,7 +52,6 @@ struct globaldata {
 	int		gd_switchticks;
 	u_int		gd_cpuno;		/* this cpu number */
 	u_int		gd_other_cpus;		/* all other cpus */
-	int		gd_inside_intr;
 	u_int64_t	gd_idlepcbphys;		/* pa of gd_idlepcb */
 	u_int64_t	gd_pending_ipis;	/* pending IPI events */
 	u_int32_t	gd_next_asn;		/* next ASN to allocate */
diff --git a/sys/powerpc/include/pcpu.h b/sys/powerpc/include/pcpu.h
index 5fd6c5948564..127dd09f6ceb 100644
--- a/sys/powerpc/include/pcpu.h
+++ b/sys/powerpc/include/pcpu.h
@@ -52,7 +52,6 @@ struct globaldata {
 	int		gd_switchticks;
 	u_int		gd_cpuno;		/* this cpu number */
 	u_int		gd_other_cpus;		/* all other cpus */
-	int		gd_inside_intr;
 	u_int64_t	gd_idlepcbphys;		/* pa of gd_idlepcb */
 	u_int64_t	gd_pending_ipis;	/* pending IPI events */
 	u_int32_t	gd_next_asn;		/* next ASN to allocate */