From owner-svn-src-projects@FreeBSD.ORG  Sat Mar  2 00:21:30 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 9F0C66E8;
 Sat,  2 Mar 2013 00:21:30 +0000 (UTC)
 (envelope-from davide@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 7AA3A1E40;
 Sat,  2 Mar 2013 00:21:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r220LUTT053451;
 Sat, 2 Mar 2013 00:21:30 GMT (envelope-from davide@svn.freebsd.org)
Received: (from davide@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r220LUHG053450;
 Sat, 2 Mar 2013 00:21:30 GMT (envelope-from davide@svn.freebsd.org)
Message-Id: <201303020021.r220LUHG053450@svn.freebsd.org>
From: Davide Italiano <davide@FreeBSD.org>
Date: Sat, 2 Mar 2013 00:21:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r247599 - projects/calloutng/sys/kern
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 02 Mar 2013 00:21:30 -0000

Author: davide
Date: Sat Mar  2 00:21:29 2013
New Revision: 247599
URL: http://svnweb.freebsd.org/changeset/base/247599

Log:
  Now that the macros THREAD_NO_SLEEPING() and THREAD_SLEEPING_OK() are
  allowed to nest, remove an old hack.

Modified:
  projects/calloutng/sys/kern/kern_timeout.c

Modified: projects/calloutng/sys/kern/kern_timeout.c
==============================================================================
--- projects/calloutng/sys/kern/kern_timeout.c	Sat Mar  2 00:11:27 2013	(r247598)
+++ projects/calloutng/sys/kern/kern_timeout.c	Sat Mar  2 00:21:29 2013	(r247599)
@@ -658,13 +658,11 @@ softclock_call_cc(struct callout *c, str
 #ifdef DIAGNOSTIC
 	sbt1 = sbinuptime();
 #endif
-	if (!direct)
-		THREAD_NO_SLEEPING();
+	THREAD_NO_SLEEPING();
 	SDT_PROBE(callout_execute, kernel, , callout_start, c, 0, 0, 0, 0);
 	c_func(c_arg);
 	SDT_PROBE(callout_execute, kernel, , callout_end, c, 0, 0, 0, 0);
-	if (!direct)
-		THREAD_SLEEPING_OK();
+	THREAD_SLEEPING_OK();
 #ifdef DIAGNOSTIC
 	bt2 = sbinuptime();
 	bt2 -= bt1;