diff options
author | avg <avg@FreeBSD.org> | 2015-09-11 12:45:56 +0000 |
---|---|---|
committer | avg <avg@FreeBSD.org> | 2015-09-11 12:45:56 +0000 |
commit | 9671a17dd92c3bb83a6dc86c6ffe6c38f29e63ad (patch) | |
tree | 14ac0a4fc83d778c3b5f5d772f1cca201039594b /sys/kern | |
parent | 423decf41a80e322c84f16ed8e771e031cfc2652 (diff) | |
download | FreeBSD-src-9671a17dd92c3bb83a6dc86c6ffe6c38f29e63ad.zip FreeBSD-src-9671a17dd92c3bb83a6dc86c6ffe6c38f29e63ad.tar.gz |
MFC r287354: callout_reset: fix a reversed check for cc_exec_cancel
Relnotes: potential erratum
Diffstat (limited to 'sys/kern')
-rw-r--r-- | sys/kern/kern_timeout.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c index 155d1f9..9f23558 100644 --- a/sys/kern/kern_timeout.c +++ b/sys/kern/kern_timeout.c @@ -1001,7 +1001,7 @@ callout_reset_sbt_on(struct callout *c, sbintime_t sbt, sbintime_t precision, * currently in progress. If there is a lock then we * can cancel the callout if it has not really started. */ - if (c->c_lock != NULL && cc_exec_cancel(cc, direct)) + if (c->c_lock != NULL && !cc_exec_cancel(cc, direct)) cancelled = cc_exec_cancel(cc, direct) = true; if (cc_exec_waiting(cc, direct)) { /* |