From fedd7c073b40fa1b74e825a822fc280f01d59160 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Mon, 30 Sep 2019 15:46:24 +0200 Subject: [PATCH] x86: correct bogus error indicator of cpu_add() Commit 54ce2db8b8 ("x86/numa: adjust datatypes for node and pxm") changed this from the -1 (i.e. -EPERM, which was already bogus) that comes back from setup_node() to NUMA_NO_NODE (0xff). Use a proper error indicator instead. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper Release-acked-by: Juergen Gross --- xen/arch/x86/smpboot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index 04a0b75b8b..f86c15bde3 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -1278,7 +1278,7 @@ int cpu_add(uint32_t apic_id, uint32_t acpi_id, uint32_t pxm) "Setup node failed for pxm %x\n", pxm); x86_acpiid_to_apicid[acpi_id] = BAD_APICID; mp_unregister_lapic(apic_id, cpu); - cpu = node; + cpu = -ENOSPC; goto out; } if ( apic_id < MAX_LOCAL_APIC ) -- 2.30.2