diff --git a/src/devices/device_util.c b/src/devices/device_util.c
index 526490a8c1..5225938e19 100644
--- a/src/devices/device_util.c
+++ b/src/devices/device_util.c
@@ -850,3 +850,21 @@ u32 find_pci_tolm(struct bus *bus)
 
 	return tolm;
 }
+
+/* Count of enabled CPUs */
+int dev_count_cpu(void)
+{
+	device_t cpu;
+	int count = 0;
+
+	for (cpu = all_devices; cpu; cpu = cpu->next) {
+		if ((cpu->path.type != DEVICE_PATH_APIC) ||
+		    (cpu->bus->dev->path.type != DEVICE_PATH_APIC_CLUSTER))
+			continue;
+		if (!cpu->enabled)
+			continue;
+		count++;
+	}
+
+	return count;
+}
diff --git a/src/include/device/device.h b/src/include/device/device.h
index c097f5796b..0aea1d6087 100644
--- a/src/include/device/device.h
+++ b/src/include/device/device.h
@@ -133,6 +133,7 @@ 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);
+int dev_count_cpu(void);
 
 /* Debug functions */
 void print_resource_tree(struct device * root, int debug_level,