Date: Wed, 18 May 2011 15:50:12 +0000 (UTC) From: Attilio Rao <attilio@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r222062 - projects/largeSMP/sys/kern Message-ID: <201105181550.p4IFoCDW098154@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201105181550.p4IFoCDW098154>