Date: Sat, 2 Mar 2013 00:21:30 +0000 (UTC) From: Davide Italiano <davide@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r247599 - projects/calloutng/sys/kern Message-ID: <201303020021.r220LUHG053450@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303020021.r220LUHG053450>