summaryrefslogtreecommitdiffstats
path: root/sys/kern/kern_timeout.c
diff options
context:
space:
mode:
authorrrs <rrs@FreeBSD.org>2015-04-13 23:06:13 +0000
committerrrs <rrs@FreeBSD.org>2015-04-13 23:06:13 +0000
commit89f83321ceeceed93f0c571c204cb60207d7572e (patch)
tree309e49e18e609828dd38f4000e9807e342a2159a /sys/kern/kern_timeout.c
parentadd4dcdc26bb2e30c01d6276b180df59ac21ef7a (diff)
downloadFreeBSD-src-89f83321ceeceed93f0c571c204cb60207d7572e.zip
FreeBSD-src-89f83321ceeceed93f0c571c204cb60207d7572e.tar.gz
Restore the two lines accidentally deleted that allow CALLOUT_DIRECT to be
specifed in the flags. Thanks Mark Johnston for noticing this ;-o MFC after: 3 days
Diffstat (limited to 'sys/kern/kern_timeout.c')
-rw-r--r--sys/kern/kern_timeout.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c
index 45892dc..1562e71 100644
--- a/sys/kern/kern_timeout.c
+++ b/sys/kern/kern_timeout.c
@@ -591,6 +591,8 @@ callout_cc_add(struct callout *c, struct callout_cpu *cc,
c->c_iflags |= CALLOUT_PENDING;
c->c_iflags &= ~CALLOUT_PROCESSED;
c->c_flags |= CALLOUT_ACTIVE;
+ if (flags & C_DIRECT_EXEC)
+ c->c_flags |= CALLOUT_DIRECT;
c->c_func = func;
c->c_time = sbt;
c->c_precision = precision;
OpenPOWER on IntegriCloud