From owner-svn-src-head@FreeBSD.ORG  Mon Apr 13 23:06:14 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E194279B;
 Mon, 13 Apr 2015 23:06:14 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id CD9818DB;
 Mon, 13 Apr 2015 23:06:14 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3DN6ENt075055;
 Mon, 13 Apr 2015 23:06:14 GMT (envelope-from rrs@FreeBSD.org)
Received: (from rrs@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3DN6Ewx075054;
 Mon, 13 Apr 2015 23:06:14 GMT (envelope-from rrs@FreeBSD.org)
Message-Id: <201504132306.t3DN6Ewx075054@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: rrs set sender to rrs@FreeBSD.org
 using -f
From: Randall Stewart <rrs@FreeBSD.org>
Date: Mon, 13 Apr 2015 23:06:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r281510 - 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.20
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: Mon, 13 Apr 2015 23:06:15 -0000

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;