diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c
index b694fff735bec89374996516034d22349d6e27fc..52787a83de5588f066eee7c6a5cf9e0218aa209a 100644
--- a/arch/arm64/kernel/smp.c
+++ b/arch/arm64/kernel/smp.c
@@ -762,8 +762,12 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
 		if (err)
 			continue;
 #ifdef CONFIG_ACPI
-		if ((cpu_madt_gicc[cpu].flags & ACPI_MADT_ENABLED))
+		if (!acpi_disabled) {
+			if ((cpu_madt_gicc[cpu].flags & ACPI_MADT_ENABLED))
+				set_cpu_present(cpu, true);
+		} else {
 			set_cpu_present(cpu, true);
+		}
 #else
 		set_cpu_present(cpu, true);
 #endif