From owner-svn-src-head@FreeBSD.ORG  Fri May 29 14:20:11 2009
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 46CB610656C3;
	Fri, 29 May 2009 14:20:11 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 359278FC25;
	Fri, 29 May 2009 14:20:11 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4TEKBmM077257;
	Fri, 29 May 2009 14:20:11 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4TEKB5N077256;
	Fri, 29 May 2009 14:20:11 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <200905291420.n4TEKB5N077256@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Fri, 29 May 2009 14:20:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193038 - 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
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: Fri, 29 May 2009 14:20:11 -0000

Author: rwatson
Date: Fri May 29 14:20:10 2009
New Revision: 193038
URL: http://svn.freebsd.org/changeset/base/193038

Log:
  Since sched_pin() and sched_unpin() are already inlined, don't manually
  inline in rmlocks.

Modified:
  head/sys/kern/kern_rmlock.c

Modified: head/sys/kern/kern_rmlock.c
==============================================================================
--- head/sys/kern/kern_rmlock.c	Fri May 29 14:03:34 2009	(r193037)
+++ head/sys/kern/kern_rmlock.c	Fri May 29 14:20:10 2009	(r193038)
@@ -327,7 +327,7 @@ _rm_rlock(struct rmlock *rm, struct rm_p
 
 	rm_tracker_add(pc, tracker);
 
-	td->td_pinned++; /*  sched_pin(); */
+	sched_pin();
 
 	compiler_memory_barrier();
 
@@ -387,7 +387,7 @@ _rm_runlock(struct rmlock *rm, struct rm
 	pc = cpuid_to_pcpu[td->td_oncpu]; /* pcpu_find(td->td_oncpu); */
 	rm_tracker_remove(pc, tracker);
 	td->td_critnest--;
-	td->td_pinned--; /*  sched_unpin(); */
+	sched_unpin();
 
 	if (0 == (td->td_owepreempt | tracker->rmp_flags))
 		return;