diff --git a/src/cpu/intel/speedstep/acpi.c b/src/cpu/intel/speedstep/acpi.c
index 839fec4185..acca77edf9 100644
--- a/src/cpu/intel/speedstep/acpi.c
+++ b/src/cpu/intel/speedstep/acpi.c
@@ -9,18 +9,6 @@
 #include <device/device.h>
 #include <types.h>
 
-static int determine_total_number_of_cores(void)
-{
-	struct device *cpu;
-	int count = 0;
-	for (cpu = all_devices; cpu; cpu = cpu->next) {
-		if (!is_enabled_cpu(cpu))
-			continue;
-		count++;
-	}
-	return count;
-}
-
 static void gen_pstate_entries(const sst_table_t *const pstates,
 			      const int cpuID, const int cores_per_package,
 			      const uint8_t coordination)
@@ -78,7 +66,7 @@ static void gen_pstate_entries(const sst_table_t *const pstates,
 void generate_cpu_entries(const struct device *device)
 {
 	int coreID, cpuID, pcontrol_blk = PMB0_BASE, plen = 6;
-	int totalcores = determine_total_number_of_cores();
+	int totalcores = dev_count_cpu();
 	int cores_per_package = (cpuid_ebx(1)>>16) & 0xff;
 	int numcpus = totalcores/cores_per_package; /* This assumes that all
 						       CPUs share the same
diff --git a/src/southbridge/intel/i82371eb/acpi_tables.c b/src/southbridge/intel/i82371eb/acpi_tables.c
index c23c2f6f31..cd002e8135 100644
--- a/src/southbridge/intel/i82371eb/acpi_tables.c
+++ b/src/southbridge/intel/i82371eb/acpi_tables.c
@@ -6,22 +6,10 @@
 #include <device/device.h>
 #include "i82371eb.h"
 
-static int determine_total_number_of_cores(void)
-{
-	struct device *cpu;
-	int count = 0;
-	for (cpu = all_devices; cpu; cpu = cpu->next) {
-		if (!is_enabled_cpu(cpu))
-			continue;
-		count++;
-	}
-	return count;
-}
-
 void generate_cpu_entries(const struct device *device)
 {
 	int cpu, pcontrol_blk=DEFAULT_PMBASE+PCNTRL, plen=6;
-	int numcpus = determine_total_number_of_cores();
+	int numcpus = dev_count_cpu();
 	printk(BIOS_DEBUG, "Found %d CPU(s).\n", numcpus);
 
 	/* without the outer scope, further ssdt addition will end up