Unverified Commit 6442c477 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!12116 [sync] PR-11856: acpi/arm64: Do not add CPU to node_to_cpumask_map in acpi_map_cpu() 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/11856 
 
PR sync from: Xiongfeng Wang <wangxiongfeng2@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/Y6QXHVSAPIPY7JWTSCFY5INIENACYDRP/ 
 
https://gitee.com/openeuler/kernel/issues/IATDZ5 
 
Link:https://gitee.com/openeuler/kernel/pulls/12116

 

Reviewed-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 9b2f1457 98cd63b0

arch/arm64/kernel/acpi.c

+1 −2
Original line number Diff line number Diff line
@@ -277,7 +277,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;
@@ -290,7 +289,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;

}