From owner-svn-src-all@freebsd.org  Thu Aug 27 10:43:36 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 099009C23DD;
 Thu, 27 Aug 2015 10:43:36 +0000 (UTC) (envelope-from jch@FreeBSD.org)
Received: from repo.freebsd.org (repo.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 EEB2F860;
 Thu, 27 Aug 2015 10:43:35 +0000 (UTC) (envelope-from jch@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7RAhZOV091855;
 Thu, 27 Aug 2015 10:43:35 GMT (envelope-from jch@FreeBSD.org)
Received: (from jch@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7RAhZSF091854;
 Thu, 27 Aug 2015 10:43:35 GMT (envelope-from jch@FreeBSD.org)
Message-Id: <201508271043.t7RAhZSF091854@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jch set sender to jch@FreeBSD.org
 using -f
From: Julien Charbon <jch@FreeBSD.org>
Date: Thu, 27 Aug 2015 10:43:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r287200 - 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-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Aug 2015 10:43:36 -0000

Author: jch
Date: Thu Aug 27 10:43:35 2015
New Revision: 287200
URL: https://svnweb.freebsd.org/changeset/base/287200

Log:
  Silent a compilation warning on callout_stop()

Modified:
  head/sys/kern/kern_timeout.c

Modified: head/sys/kern/kern_timeout.c
==============================================================================
--- head/sys/kern/kern_timeout.c	Thu Aug 27 09:06:14 2015	(r287199)
+++ head/sys/kern/kern_timeout.c	Thu Aug 27 10:43:35 2015	(r287200)
@@ -1150,7 +1150,8 @@ _callout_stop_safe(struct callout *c, in
 	struct callout_cpu *cc, *old_cc;
 	struct lock_class *class;
 	int direct, sq_locked, use_lock;
-	int not_on_a_list, not_running;
+	int not_on_a_list;
+	int not_running = 1;
 
 	if (safe)
 		WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, c->c_lock,
@@ -1385,8 +1386,7 @@ again:
 		 * and indeed impossible to stop then return 0.
 		 */
 		not_running = !(cc_exec_curr(cc, direct) == c);
-	} else
-		not_running = 1;
+	}
 
 	CC_UNLOCK(cc);
 	return (not_running);