svn commit: r222062 - projects/largeSMP/sys/kern

[Attilio Rao]

Author: attilio
Date: Wed May 18 15:50:12 2011
New Revision: 222062
URL: http://svn.freebsd.org/changeset/base/222062

Log:
  Fix mismerge.
  
  Reported by:	pluknet

Modified:
  projects/largeSMP/sys/kern/subr_smp.c

Modified: projects/largeSMP/sys/kern/subr_smp.c
==============================================================================
--- projects/largeSMP/sys/kern/subr_smp.c	Wed May 18 15:09:48 2011	(r222061)
+++ projects/largeSMP/sys/kern/subr_smp.c	Wed May 18 15:50:12 2011	(r222062)
@@ -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