diff --git a/src/device/device_util.c b/src/device/device_util.c
index 1e13bca..0be6cfb 100644
--- a/src/device/device_util.c
+++ b/src/device/device_util.c
@@ -917,10 +917,7 @@
 	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_CPU_CLUSTER))
-			continue;
-		if (!cpu->enabled)
+		if (!is_enabled_cpu(cpu))
 			continue;
 		count++;
 	}