Date: Thu, 27 Aug 2015 10:43:35 +0000 (UTC) From: Julien Charbon <jch@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r287200 - head/sys/kern Message-ID: <201508271043.t7RAhZSF091854@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508271043.t7RAhZSF091854>