From fa7e2a0e5db985af527bbce5fdebb4d9c721a822 Mon Sep 17 00:00:00 2001 From: Michael Mueller Date: Thu, 13 Oct 2022 16:01:51 +0200 Subject: [PATCH] Fixed remapping skipping every second virtual CPU ID. --- repos/base-nova/include/nova/syscall-generic.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/repos/base-nova/include/nova/syscall-generic.h b/repos/base-nova/include/nova/syscall-generic.h index 5b9b5d94ad..2eb5509383 100644 --- a/repos/base-nova/include/nova/syscall-generic.h +++ b/repos/base-nova/include/nova/syscall-generic.h @@ -195,19 +195,19 @@ namespace Nova { for (uint8_t core = 0; core < 255; core++) { for (uint8_t thread = 0; thread < 255; thread++) { for (unsigned i = 0; i < cpu_max(); i++) { - if (i == boot_cpu || !is_cpu_enabled(i)) + if (i == boot_cpu || !is_cpu_enabled(i)) continue; Cpu_desc const * const c = cpu_desc_of_cpu(i); - if (!c) + if (!c) continue; if (!(c->package == package && c->core == core && c->thread == thread)) continue; + cpu_numa_map[cpu_i] = c->numa_id; map_cpus[cpu_i++] = (uint8_t)i; - cpu_numa_map[cpu_i++] = c->numa_id; if (cpu_i >= num_cpus) return true; }