summaryrefslogtreecommitdiffstats
path: root/sys/kern/subr_smp.c
diff options
context:
space:
mode:
authorattilio <attilio@FreeBSD.org>2011-05-18 15:50:12 +0000
committerattilio <attilio@FreeBSD.org>2011-05-18 15:50:12 +0000
commit0828d417d4beda5c42e8953b1905d327f1da5653 (patch)
treef0340245bf81b91133473ebed89a50327a97ea1a /sys/kern/subr_smp.c
parent91b7b9b42725727fac6e5ae79b23628febe6ab79 (diff)
downloadFreeBSD-src-0828d417d4beda5c42e8953b1905d327f1da5653.zip
FreeBSD-src-0828d417d4beda5c42e8953b1905d327f1da5653.tar.gz
Fix mismerge.
Reported by: pluknet
Diffstat (limited to 'sys/kern/subr_smp.c')
-rw-r--r--sys/kern/subr_smp.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/kern/subr_smp.c b/sys/kern/subr_smp.c
index 83655e8..ce66f44 100644
--- a/sys/kern/subr_smp.c
+++ b/sys/kern/subr_smp.c
@@ -53,10 +53,10 @@ __FBSDID("$FreeBSD$");
#include "opt_sched.h"
#ifdef SMP
-volatile cpumask_t stopped_cpus;
-volatile cpumask_t started_cpus;
-cpumask_t hlt_cpus_mask;
-cpumask_t logical_cpus_mask;
+volatile cpuset_t stopped_cpus;
+volatile cpuset_t started_cpus;
+cpuset_t hlt_cpus_mask;
+cpuset_t logical_cpus_mask;
void (*cpustop_restartfunc)(void);
#endif
OpenPOWER on IntegriCloud