From owner-svn-src-head@FreeBSD.ORG  Tue Dec  3 14:50:13 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 7D74FF26;
 Tue,  3 Dec 2013 14:50:13 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6A7301870;
 Tue,  3 Dec 2013 14:50:13 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB3EoDwb058397;
 Tue, 3 Dec 2013 14:50:13 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB3EoDZe058396;
 Tue, 3 Dec 2013 14:50:13 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201312031450.rB3EoDZe058396@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Tue, 3 Dec 2013 14:50:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r258869 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Dec 2013 14:50:13 -0000

Author: jhb
Date: Tue Dec  3 14:50:12 2013
New Revision: 258869
URL: http://svnweb.freebsd.org/changeset/base/258869

Log:
  Fix an off-by-one error in r228960.  The maximum priority delta provided
  by SCHED_PRI_TICKS should be SCHED_PRI_RANGE - 1 so that the resulting
  priority value (before nice adjustment) is between SCHED_PRI_MIN and
  SCHED_PRI_MAX, inclusive.
  
  Submitted by:	kib
  Reported by:	pho
  MFC after:	1 week

Modified:
  head/sys/kern/sched_ule.c

Modified: head/sys/kern/sched_ule.c
==============================================================================
--- head/sys/kern/sched_ule.c	Tue Dec  3 13:38:13 2013	(r258868)
+++ head/sys/kern/sched_ule.c	Tue Dec  3 14:50:12 2013	(r258869)
@@ -1532,7 +1532,7 @@ sched_priority(struct thread *td)
 		pri = SCHED_PRI_MIN;
 		if (td->td_sched->ts_ticks)
 			pri += min(SCHED_PRI_TICKS(td->td_sched),
-			    SCHED_PRI_RANGE);
+			    SCHED_PRI_RANGE - 1);
 		pri += SCHED_PRI_NICE(td->td_proc->p_nice);
 		KASSERT(pri >= PRI_MIN_BATCH && pri <= PRI_MAX_BATCH,
 		    ("sched_priority: invalid priority %d: nice %d, "