From owner-svn-src-head@FreeBSD.ORG Thu Sep 2 16:25:52 2010 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4B8631065804; Thu, 2 Sep 2010 16:25:52 +0000 (UTC) (envelope-from mdf356@gmail.com) Received: from mail-ey0-f182.google.com (mail-ey0-f182.google.com [209.85.215.182]) by mx1.freebsd.org (Postfix) with ESMTP id 813E28FC1A; Thu, 2 Sep 2010 16:25:51 +0000 (UTC) Received: by eyx24 with SMTP id 24so458432eyx.13 for ; Thu, 02 Sep 2010 09:25:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:sender:received :in-reply-to:references:date:x-google-sender-auth:message-id:subject :from:to:content-type:content-transfer-encoding; bh=j0pQiRpK3QYnH7jl8HwBL1M6a7TiRQrQXdalBY6hMJ4=; b=pupR4o6I59IIjm/LV5JegpVxbpYgv5O+0nN9UTCkJy+qABdA5W0XdHK8t/uTXMmDIi lZ/QBzoNDJPkwK0ITK1E0xRfzoQbMyHRywz8WACMYs+snfR4uT7BSTmRmc2cf2K/BFYS OZSgNGid4RhiCOiVPQ3avM/iKZXqKpguu1gPM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:content-type :content-transfer-encoding; b=v7AsymCsnBjIqSZCdhvX2d73l09X5eU/Ua+0tpWBpnQLmvUvGuDF4Nm4PQXGMjEQAu Iac2BAMmfmwcmV11LfBwwPzUCRnK3YVaeZQhnLq/a1rBTW4RrUndOBs4rLfz119V7QF2 HiYXwZ/HZW6ufuPm6rG0eJxNQyYUcNp9gw4sM= MIME-Version: 1.0 Received: by 10.213.19.203 with SMTP id c11mr2003414ebb.31.1283444750401; Thu, 02 Sep 2010 09:25:50 -0700 (PDT) Sender: mdf356@gmail.com Received: by 10.213.30.13 with HTTP; Thu, 2 Sep 2010 09:25:50 -0700 (PDT) In-Reply-To: <201009021623.o82GN68s010863@svn.freebsd.org> References: <201009021623.o82GN68s010863@svn.freebsd.org> Date: Thu, 2 Sep 2010 09:25:50 -0700 X-Google-Sender-Auth: jQy5zqpNgiiiCJpzffx-BxBPqTQ Message-ID: From: mdf@FreeBSD.org To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: Subject: Re: svn commit: r212153 - head/sys/kern X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Sep 2010 16:25:52 -0000 On Thu, Sep 2, 2010 at 9:23 AM, Matthew D Fleming wrote: > Author: mdf > Date: Thu Sep =A02 16:23:05 2010 > New Revision: 212153 > URL: http://svn.freebsd.org/changeset/base/212153 > > Log: > =A0Fix UP build. Noticed by b.f. (bf1783 at gmail dot com) We apologize for the inconvenience. matthew > =A0MFC after: =A0 =A02 weeks > > Modified: > =A0head/sys/kern/sched_ule.c > > Modified: head/sys/kern/sched_ule.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/kern/sched_ule.c =A0 Thu Sep =A02 16:11:12 2010 =A0 =A0 =A0 = =A0(r212152) > +++ head/sys/kern/sched_ule.c =A0 Thu Sep =A02 16:23:05 2010 =A0 =A0 =A0 = =A0(r212153) > @@ -1797,8 +1797,10 @@ sched_switch(struct thread *td, struct t > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0srqflag =3D (flags & SW_PREEMPT) ? > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0SRQ_OURSELF|SRQ_YIELDING|SRQ_PREEM= PTED : > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0SRQ_OURSELF|SRQ_YIELDING; > +#ifdef SMP > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0if (THREAD_CAN_MIGRATE(td) && !THREAD_CAN_= SCHED(td, ts->ts_cpu)) > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0ts->ts_cpu =3D sched_pickc= pu(td, 0); > +#endif > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0if (ts->ts_cpu =3D=3D cpuid) > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0tdq_runq_add(tdq, td, srqf= lag); > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0else { >