diff --git a/src/add-ons/kernel/drivers/power/x86_cpuidle/acpi_cpuidle.cpp b/src/add-ons/kernel/drivers/power/x86_cpuidle/acpi_cpuidle.cpp
index 34a3f64abd..1734312152 100644
--- a/src/add-ons/kernel/drivers/power/x86_cpuidle/acpi_cpuidle.cpp
+++ b/src/add-ons/kernel/drivers/power/x86_cpuidle/acpi_cpuidle.cpp
@@ -94,7 +94,7 @@ struct acpi_cstate_info {
 };
 
 
-static acpi_cpuidle_driver_info *sAcpiProcessor[B_MAX_CPU_COUNT];
+static acpi_cpuidle_driver_info *sAcpiProcessor[SMP_MAX_CPUS];
 static CpuidleDevice sAcpiDevice;
 static device_manager_info *sDeviceManager;
 static acpi_module_info *sAcpi;
diff --git a/src/tests/system/kernel/spinlock_contention.cpp b/src/tests/system/kernel/spinlock_contention.cpp
index 54c6b38abc..8dd796d8c8 100644
--- a/src/tests/system/kernel/spinlock_contention.cpp
+++ b/src/tests/system/kernel/spinlock_contention.cpp
@@ -33,8 +33,8 @@ struct dummy_smp_msg {
 
 static int				sNumCPUs = 2;
 static bool				sICIEnabled = true;
-static dummy_spinlock	cpu_msg_spinlock[B_MAX_CPU_COUNT];
-static dummy_smp_msg*	smp_msgs[B_MAX_CPU_COUNT];
+static dummy_spinlock	cpu_msg_spinlock[SMP_MAX_CPUS];
+static dummy_smp_msg*	smp_msgs[SMP_MAX_CPUS];
 static dummy_spinlock	broadcast_msg_spinlock;
 static dummy_smp_msg*	smp_broadcast_msgs;