From owner-svn-src-stable-8@FreeBSD.ORG  Thu Jan  5 18:56:23 2012
Return-Path: <owner-svn-src-stable-8@FreeBSD.ORG>
Delivered-To: svn-src-stable-8@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EF5EF1065670;
	Thu,  5 Jan 2012 18:56:23 +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 DE1B28FC15;
	Thu,  5 Jan 2012 18:56:23 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q05IuNsc050121;
	Thu, 5 Jan 2012 18:56:23 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q05IuN05050119;
	Thu, 5 Jan 2012 18:56:23 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201201051856.q05IuN05050119@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Thu, 5 Jan 2012 18:56:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r229620 - stable/8/sys/kern
X-BeenThere: svn-src-stable-8@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 8-stable src tree
	<svn-src-stable-8.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-8>
List-Post: <mailto:svn-src-stable-8@freebsd.org>
List-Help: <mailto:svn-src-stable-8-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Jan 2012 18:56:24 -0000

Author: jhb
Date: Thu Jan  5 18:56:23 2012
New Revision: 229620
URL: http://svn.freebsd.org/changeset/base/229620

Log:
  MFC 228207:
  When changing the user priority of a thread, change the real priority
  in addition to the user priority for threads whose current real priority
  is equal to the previous user priority or if the new priority is a
  real-time priority.  This allows priority changes of other threads to
  have an immediate effect.

Modified:
  stable/8/sys/kern/kern_resource.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/kern/kern_resource.c
==============================================================================
--- stable/8/sys/kern/kern_resource.c	Thu Jan  5 18:55:59 2012	(r229619)
+++ stable/8/sys/kern/kern_resource.c	Thu Jan  5 18:56:23 2012	(r229620)
@@ -497,8 +497,9 @@ rtp_to_pri(struct rtprio *rtp, struct th
 	sched_class(td, rtp->type);	/* XXX fix */
 	oldpri = td->td_user_pri;
 	sched_user_prio(td, newpri);
-	if (curthread == td)
-		sched_prio(curthread, td->td_user_pri); /* XXX dubious */
+	if (td->td_user_pri != oldpri && (td == curthread ||
+	    td->td_priority == oldpri || td->td_user_pri >= PRI_MAX_REALTIME))
+		sched_prio(td, td->td_user_pri);
 	if (TD_ON_UPILOCK(td) && oldpri != newpri) {
 		thread_unlock(td);
 		umtx_pi_adjust(td, oldpri);