From owner-svn-src-stable@FreeBSD.ORG  Thu Jan 27 20:12:36 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 263DB10656A5;
	Thu, 27 Jan 2011 20:12:36 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1566D8FC26;
	Thu, 27 Jan 2011 20:12:36 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0RKCZ5h033987;
	Thu, 27 Jan 2011 20:12:35 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0RKCZNQ033985;
	Thu, 27 Jan 2011 20:12:35 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201101272012.p0RKCZNQ033985@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Thu, 27 Jan 2011 20:12:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r217977 - stable/7/sys/kern
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Jan 2011 20:12:36 -0000

Author: jhb
Date: Thu Jan 27 20:12:35 2011
New Revision: 217977
URL: http://svn.freebsd.org/changeset/base/217977

Log:
  MFC 217077:
  Only change the priority of timeshare threads to PRI_MAX_TIMESHARE
  when yield() is called.  Specifically, leave the priority of real time
  and idle threads unchanged.

Modified:
  stable/7/sys/kern/kern_synch.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)
  stable/7/sys/dev/usb/   (props changed)

Modified: stable/7/sys/kern/kern_synch.c
==============================================================================
--- stable/7/sys/kern/kern_synch.c	Thu Jan 27 20:12:18 2011	(r217976)
+++ stable/7/sys/kern/kern_synch.c	Thu Jan 27 20:12:35 2011	(r217977)
@@ -552,7 +552,8 @@ yield(struct thread *td, struct yield_ar
 {
 
 	thread_lock(td);
-	sched_prio(td, PRI_MAX_TIMESHARE);
+	if (PRI_BASE(td->td_pri_class) == PRI_TIMESHARE)
+		sched_prio(td, PRI_MAX_TIMESHARE);
 	mi_switch(SW_VOL, NULL);
 	thread_unlock(td);
 	td->td_retval[0] = 0;