From owner-svn-src-projects@FreeBSD.ORG  Fri Mar  1 21:12:21 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 7F9CB961;
 Fri,  1 Mar 2013 21:12:21 +0000 (UTC) (envelope-from mav@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 5B989181C;
 Fri,  1 Mar 2013 21:12:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r21LCL2k094167;
 Fri, 1 Mar 2013 21:12:21 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r21LCLgc094166;
 Fri, 1 Mar 2013 21:12:21 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201303012112.r21LCLgc094166@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Fri, 1 Mar 2013 21:12:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r247581 - 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: Fri, 01 Mar 2013 21:12:21 -0000

Author: mav
Date: Fri Mar  1 21:12:20 2013
New Revision: 247581
URL: http://svnweb.freebsd.org/changeset/base/247581

Log:
  Fix a stupid nasty bug that could cause silent memory corruptions.

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

Modified: projects/calloutng/sys/kern/kern_timeout.c
==============================================================================
--- projects/calloutng/sys/kern/kern_timeout.c	Fri Mar  1 21:01:45 2013	(r247580)
+++ projects/calloutng/sys/kern/kern_timeout.c	Fri Mar  1 21:12:20 2013	(r247581)
@@ -948,7 +948,7 @@ callout_reset_sbt_on(struct callout *c, 
 	 */
 	if (c->c_flags & CALLOUT_LOCAL_ALLOC)
 		cpu = c->c_cpu;
-	direct = c->c_flags & CALLOUT_DIRECT;
+	direct = !!(c->c_flags & CALLOUT_DIRECT);
 	KASSERT(!direct || c->c_lock == NULL,
 	    ("%s: direct callout %p has lock", __func__, c));
 	cc = callout_lock(c);
@@ -1057,7 +1057,7 @@ _callout_stop_safe(c, safe)
 		}
 	} else
 		use_lock = 0;
-	direct = c->c_flags & CALLOUT_DIRECT;
+	direct = !!(c->c_flags & CALLOUT_DIRECT);
 	sq_locked = 0;
 	old_cc = NULL;
 again: