Date: Thu, 16 Sep 2010 15:42:56 +0000 (UTC) From: Matthew D Fleming <mdf@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r212748 - stable/7/sys/kern Message-ID: <201009161542.o8GFgu6j097016@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mdf Date: Thu Sep 16 15:42:56 2010 New Revision: 212748 URL: http://svn.freebsd.org/changeset/base/212748 Log: MFC r212153: Fix UP build. Modified: stable/7/sys/kern/sched_ule.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/kern/sched_ule.c ============================================================================== --- stable/7/sys/kern/sched_ule.c Thu Sep 16 15:42:11 2010 (r212747) +++ stable/7/sys/kern/sched_ule.c Thu Sep 16 15:42:56 2010 (r212748) @@ -1885,8 +1885,10 @@ sched_switch(struct thread *td, struct t srqflag = (flags & SW_PREEMPT) ? SRQ_OURSELF|SRQ_YIELDING|SRQ_PREEMPTED : SRQ_OURSELF|SRQ_YIELDING; +#ifdef SMP if (THREAD_CAN_MIGRATE(td) && !THREAD_CAN_SCHED(td, ts->ts_cpu)) ts->ts_cpu = sched_pickcpu(td, 0); +#endif if (ts->ts_cpu == cpuid) tdq_add(tdq, td, srqflag); else {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201009161542.o8GFgu6j097016>