summaryrefslogtreecommitdiff
path: root/sys/arch/loongson
diff options
context:
space:
mode:
authorVisa Hankala <visa@cvs.openbsd.org>2021-07-24 08:21:14 +0000
committerVisa Hankala <visa@cvs.openbsd.org>2021-07-24 08:21:14 +0000
commit355a181f87e40a5e5fa65ee6cd9c5aebdd15bf03 (patch)
tree27705794d05663f326e8a0fa8faca9243adb4865 /sys/arch/loongson
parent9a3087d51dd0d90e1aca7018ce0d28dd8f7ddf88 (diff)
Replace cpus_running with CPU_IS_RUNNING().
Diffstat (limited to 'sys/arch/loongson')
-rw-r--r--sys/arch/loongson/loongson/generic3a_machdep.c6
-rw-r--r--sys/arch/loongson/loongson/machdep.c3
2 files changed, 4 insertions, 5 deletions
diff --git a/sys/arch/loongson/loongson/generic3a_machdep.c b/sys/arch/loongson/loongson/generic3a_machdep.c
index 63e29efc4dd..28d09905bc3 100644
--- a/sys/arch/loongson/loongson/generic3a_machdep.c
+++ b/sys/arch/loongson/loongson/generic3a_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: generic3a_machdep.c,v 1.10 2020/07/21 05:56:02 visa Exp $ */
+/* $OpenBSD: generic3a_machdep.c,v 1.11 2021/07/24 08:21:13 visa Exp $ */
/*
* Copyright (c) 2009, 2010, 2012 Miodrag Vallat.
@@ -317,8 +317,8 @@ generic3a_boot_secondary_cpu(struct cpu_info *ci)
REGVAL64(ls3_ipi_base[ci->ci_cpuid] + LS3_IPI_MBOX0) =
(uint64_t)hw_cpu_spinup_trampoline; /* pc */
- while (!cpuset_isset(&cpus_running, ci))
- continue;
+ while (!CPU_IS_RUNNING(ci))
+ membar_sync();
}
int
diff --git a/sys/arch/loongson/loongson/machdep.c b/sys/arch/loongson/loongson/machdep.c
index 073fd407364..536110279ad 100644
--- a/sys/arch/loongson/loongson/machdep.c
+++ b/sys/arch/loongson/loongson/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.98 2021/07/12 09:32:37 visa Exp $ */
+/* $OpenBSD: machdep.c,v 1.99 2021/07/24 08:21:13 visa Exp $ */
/*
* Copyright (c) 2009, 2010, 2014 Miodrag Vallat.
@@ -1308,7 +1308,6 @@ hw_cpu_hatch(struct cpu_info *ci)
membar_sync();
ncpus++;
- cpuset_add(&cpus_running, ci);
spl0();
(void)updateimask(0);