From 906d7a4b521c19b2b1ae3ec844b5d4626f2fd529 Mon Sep 17 00:00:00 2001 From: Ruslan Bukin Date: Thu, 3 Jul 2025 21:43:01 +0100 Subject: [PATCH] hwt: fix !SMP build. Sponsored by: UKRI --- sys/dev/hwt/hwt_ioctl.c | 2 ++ sys/dev/hwt/hwt_vm.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/sys/dev/hwt/hwt_ioctl.c b/sys/dev/hwt/hwt_ioctl.c index 04133838d29..592db4931bb 100644 --- a/sys/dev/hwt/hwt_ioctl.c +++ b/sys/dev/hwt/hwt_ioctl.c @@ -305,9 +305,11 @@ hwt_ioctl_alloc_mode_cpu(struct thread *td, struct hwt_owner *ho, return (error); CPU_FOREACH_ISSET(cpu_id, &cpu_map) { +#ifdef SMP /* Ensure CPU is not halted. */ if (CPU_ISSET(cpu_id, &hlt_cpus_mask)) return (ENXIO); +#endif #if 0 /* TODO: Check if the owner have this cpu configured already. */ ctx = hwt_owner_lookup_ctx_by_cpu(ho, halloc->cpu); diff --git a/sys/dev/hwt/hwt_vm.c b/sys/dev/hwt/hwt_vm.c index a6799c30300..6c55e218dce 100644 --- a/sys/dev/hwt/hwt_vm.c +++ b/sys/dev/hwt/hwt_vm.c @@ -213,9 +213,11 @@ hwt_vm_start_cpu_mode(struct hwt_context *ctx) CPU_ZERO(&enable_cpus); CPU_FOREACH_ISSET(cpu_id, &ctx->cpu_map) { +#ifdef SMP /* Ensure CPU is not halted. */ if (CPU_ISSET(cpu_id, &hlt_cpus_mask)) continue; +#endif hwt_backend_configure(ctx, cpu_id, cpu_id);