D34626.diff
No OneTemporary
Actions

Size

905 B

Referenced Files

None

Subscribers

None

D34626.diff
View Options

	diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c
	--- a/sys/kern/kern_timeout.c
	+++ b/sys/kern/kern_timeout.c
	@@ -1309,7 +1309,7 @@
	cc_exec_drain(cc, direct) = drain;
	}
	CC_UNLOCK(cc);
	- return ((flags & CS_EXECUTING) != 0);
	+ return (0);
	} else {
	CTR3(KTR_CALLOUT, "failed to stop %p func %p arg %p",
	c, c->c_func, c->c_arg);
	@@ -1321,7 +1321,7 @@
	}
	}
	KASSERT(!sq_locked, ("sleepqueue chain still locked"));
	- cancelled = ((flags & CS_EXECUTING) != 0);
	+ cancelled = 0;
	} else
	cancelled = 1;

	diff --git a/sys/sys/callout.h b/sys/sys/callout.h
	--- a/sys/sys/callout.h
	+++ b/sys/sys/callout.h
	@@ -64,8 +64,6 @@

	/* Flags for callout_stop_safe() */
	#define CS_DRAIN 0x0001 /* callout_drain(), wait allowed */
	-#define CS_EXECUTING 0x0002 /* Positive return value indicates that
	- the callout was executing */

	#ifdef _KERNEL
	/*