diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c
index a81105cfe57e2cdbf0f505b525ab0625e550be86..f043bec3ba50f529b152a927ac5c25209839f747 100644
--- a/arch/arm64/kernel/acpi.c
+++ b/arch/arm64/kernel/acpi.c
@@ -417,7 +417,6 @@ int acpi_map_cpu(acpi_handle handle, phys_cpuid_t physid, u32 acpi_id,
 	nid = acpi_get_node(handle);
 	if (nid != NUMA_NO_NODE) {
 		set_cpu_numa_node(cpu, nid);
-		numa_add_cpu(cpu);
 	}
 
 	*pcpu = cpu;
@@ -430,7 +429,7 @@ EXPORT_SYMBOL(acpi_map_cpu);
 int acpi_unmap_cpu(int cpu)
 {
 	set_cpu_present(cpu, false);
-	numa_clear_node(cpu);
+	set_cpu_numa_node(cpu, NUMA_NO_NODE);
 
 	return 0;
 }