Author: rrs
Date: Mon Apr 13 23:06:13 2015
New Revision: 281510
URL: https://svnweb.freebsd.org/changeset/base/281510

Log:
  Restore the two lines accidentally deleted that allow CALLOUT_DIRECT to be
  specifed in the flags.
  
  Thanks Mark Johnston for noticing this ;-o
  
  MFC after:    3 days

Modified:
  head/sys/kern/kern_timeout.c

Modified: head/sys/kern/kern_timeout.c
==============================================================================
--- head/sys/kern/kern_timeout.c        Mon Apr 13 22:51:09 2015        
(r281509)
+++ head/sys/kern/kern_timeout.c        Mon Apr 13 23:06:13 2015        
(r281510)
@@ -591,6 +591,8 @@ callout_cc_add(struct callout *c, struct
        c->c_iflags |= CALLOUT_PENDING;
        c->c_iflags &= ~CALLOUT_PROCESSED;
        c->c_flags |= CALLOUT_ACTIVE;
+       if (flags & C_DIRECT_EXEC)
+               c->c_flags |= CALLOUT_DIRECT;
        c->c_func = func;
        c->c_time = sbt;
        c->c_precision = precision;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to