diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-04-04 09:36:57 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-04-04 14:46:23 +0200 |
| commit | de8a76da2f374792594ce03a203b3f30e4889f6f (patch) | |
| tree | 12b5e1e59358005c3c522955c08aee4795e4829c /freebsd/sys/kern/kern_timeout.c | |
| parent | Enable bridging by default (diff) | |
| download | rtems-libbsd-de8a76da2f374792594ce03a203b3f30e4889f6f.tar.bz2 | |
Update to FreeBSD head 2017-04-04
Git mirror commit 642b174daddbd0efd9bb5f242c43f4ab4db6869f.
Diffstat (limited to 'freebsd/sys/kern/kern_timeout.c')
| -rw-r--r-- | freebsd/sys/kern/kern_timeout.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/freebsd/sys/kern/kern_timeout.c b/freebsd/sys/kern/kern_timeout.c index 73b55338..17d23ba6 100644 --- a/freebsd/sys/kern/kern_timeout.c +++ b/freebsd/sys/kern/kern_timeout.c @@ -1345,9 +1345,12 @@ again: if (cc_exec_curr(cc, direct) == c) { /* * Succeed we to stop it or not, we must clear the - * active flag - this is what API users expect. + * active flag - this is what API users expect. If we're + * draining and the callout is currently executing, first wait + * until it finishes. */ - c->c_flags &= ~CALLOUT_ACTIVE; + if ((flags & CS_DRAIN) == 0) + c->c_flags &= ~CALLOUT_ACTIVE; if ((flags & CS_DRAIN) != 0) { /* @@ -1419,6 +1422,7 @@ again: &cc->cc_lock, "codrain", 0); #endif /* __rtems__ */ } + c->c_flags &= ~CALLOUT_ACTIVE; } else if (use_lock && !cc_exec_cancel(cc, direct) && (drain == NULL)) { |