]> xenbits.xensource.com Git - people/larsk/xen.git/commitdiff
x86: correct bogus error indicator of cpu_add()
authorJan Beulich <jbeulich@suse.com>
Mon, 30 Sep 2019 13:46:24 +0000 (15:46 +0200)
committerJan Beulich <jbeulich@suse.com>
Mon, 30 Sep 2019 13:46:24 +0000 (15:46 +0200)
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 <jbeulich@suse.com>
Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
Release-acked-by: Juergen Gross <jgross@suse.com>
xen/arch/x86/smpboot.c

index 04a0b75b8b87992a569933a0f82741cbb8b900d2..f86c15bde38195ec1aa6438ebe028b6cb3d82347 100644 (file)
@@ -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 )