3 files changed, 0 insertions, 51 deletions
diff --git a/sys/i386/include/apic.h b/sys/i386/include/apic.h
index 6345ce7e60e8..70b8011fceab 100644
--- a/sys/i386/include/apic.h
+++ b/sys/i386/include/apic.h
@@ -458,28 +458,4 @@ typedef struct IOAPIC ioapic_t;
 
 #define IOART_INTVEC	0x000000ff	/* R/W: INTerrupt vector field */
 
-#ifdef LOCORE
-
-#ifdef SMP
-
-/*
- * Protects the IO APIC and apic_imen as a critical region.
- */
-#define IMASK_LOCK	MTX_LOCK_SPIN(imen_mtx, 0)
-#define IMASK_UNLOCK	MTX_UNLOCK_SPIN(imen_mtx)
-
-#else  /* SMP */
-
-#define IMASK_LOCK				/* NOP */
-#define IMASK_UNLOCK				/* NOP */
-
-#endif /* SMP */
-
-#else /* LOCORE */
-
-/* global data in mp_machdep.c */
-extern struct mtx	imen_mtx;
-
-#endif /* LOCORE */
-
 #endif /* _MACHINE_APIC_H_ */
diff --git a/sys/i386/include/apicreg.h b/sys/i386/include/apicreg.h
index 6345ce7e60e8..70b8011fceab 100644
--- a/sys/i386/include/apicreg.h
+++ b/sys/i386/include/apicreg.h
@@ -458,28 +458,4 @@ typedef struct IOAPIC ioapic_t;
 
 #define IOART_INTVEC	0x000000ff	/* R/W: INTerrupt vector field */
 
-#ifdef LOCORE
-
-#ifdef SMP
-
-/*
- * Protects the IO APIC and apic_imen as a critical region.
- */
-#define IMASK_LOCK	MTX_LOCK_SPIN(imen_mtx, 0)
-#define IMASK_UNLOCK	MTX_UNLOCK_SPIN(imen_mtx)
-
-#else  /* SMP */
-
-#define IMASK_LOCK				/* NOP */
-#define IMASK_UNLOCK				/* NOP */
-
-#endif /* SMP */
-
-#else /* LOCORE */
-
-/* global data in mp_machdep.c */
-extern struct mtx	imen_mtx;
-
-#endif /* LOCORE */
-
 #endif /* _MACHINE_APIC_H_ */
diff --git a/sys/i386/include/mptable.h b/sys/i386/include/mptable.h
index e8da25b887fe..1feb66af173c 100644
--- a/sys/i386/include/mptable.h
+++ b/sys/i386/include/mptable.h
@@ -320,9 +320,6 @@ static void	release_aps(void *dummy);
  * initialize all the SMP locks
  */
 
-/* critical region around IO APIC, apic_imen */
-struct mtx		imen_mtx;
-
 /* lock region used by kernel profiling */
 int	mcount_lock;