diff --git a/sys/x86/include/apicvar.h b/sys/x86/include/apicvar.h
index ac6a82659e3..61c726f150d 100644
--- a/sys/x86/include/apicvar.h
+++ b/sys/x86/include/apicvar.h
@@ -258,6 +258,7 @@ void	lapic_handle_intr(int vector, struct trapframe *frame);
 void	lapic_handle_timer(struct trapframe *frame);
 
 int	ioapic_get_rid(u_int apic_id, uint16_t *ridp);
+device_t ioapic_get_dev(u_int apic_id);
 
 extern int x2apic_mode;
 extern int lapic_eoi_suppression;
diff --git a/sys/x86/x86/io_apic.c b/sys/x86/x86/io_apic.c
index 4337d1adc8a..525547f9482 100644
--- a/sys/x86/x86/io_apic.c
+++ b/sys/x86/x86/io_apic.c
@@ -1081,6 +1081,22 @@ ioapic_get_rid(u_int apic_id, uint16_t *ridp)
 	return (0);
 }
 
+device_t
+ioapic_get_dev(u_int apic_id)
+{
+	struct ioapic *io;
+
+	mtx_lock_spin(&icu_lock);
+	STAILQ_FOREACH(io, &ioapic_list, io_next) {
+		if (io->io_hw_apic_id == apic_id)
+			break;
+	}
+	mtx_unlock_spin(&icu_lock);
+	if (io != NULL)
+		return (io->pci_dev);
+	return (NULL);
+}
+
 /*
  * A new-bus driver to consume the memory resources associated with
  * the APICs in the system.  On some systems ACPI or PnPBIOS system