diff --git a/src/devices/device_util.c b/src/devices/device_util.c
index 84fb11505c..5b182e1e89 100644
--- a/src/devices/device_util.c
+++ b/src/devices/device_util.c
@@ -109,6 +109,26 @@ struct device *dev_find_slot_on_smbus(unsigned int bus, unsigned int addr)
 	return result;
 }
 
+/**
+ * Given a Local APIC ID, find the device structure.
+ *
+ * @param apic_id The Local APIC ID number.
+ * @return Pointer to the device structure (if found), 0 otherwise.
+ */
+device_t dev_find_lapic(unsigned apic_id)
+{
+	device_t dev, result = NULL;
+
+	for (dev = all_devices; dev; dev = dev->next) {
+		if (dev->path.type == DEVICE_PATH_APIC &&
+		    dev->path.apic.apic_id == apic_id) {
+			result = dev;
+			break;
+		}
+	}
+	return result;
+}
+
 /**
  * Find a device of a given vendor and type.
  *
diff --git a/src/include/device/device.h b/src/include/device/device.h
index a7de0c9bb2..c097f5796b 100644
--- a/src/include/device/device.h
+++ b/src/include/device/device.h
@@ -132,6 +132,7 @@ device_t dev_find_device (u16 vendor, u16 device, device_t from);
 device_t dev_find_class (unsigned int class, device_t from);
 device_t dev_find_slot (unsigned int bus, unsigned int devfn);
 device_t dev_find_slot_on_smbus (unsigned int bus, unsigned int addr);
+device_t dev_find_lapic(unsigned apic_id);
 
 /* Debug functions */
 void print_resource_tree(struct device * root, int debug_level,