D27266.diff
No OneTemporary
Actions

Size

646 B

Referenced Files

None

Subscribers

None

D27266.diff
View Options

	Index: head/sys/kern/kern_timeout.c
	===================================================================
	--- head/sys/kern/kern_timeout.c
	+++ head/sys/kern/kern_timeout.c
	@@ -1145,7 +1145,7 @@
	* just wait for the current invocation to
	* finish.
	*/
	- while (cc_exec_curr(cc, direct) == c) {
	+ if (cc_exec_curr(cc, direct) == c) {
	/*
	* Use direct calls to sleepqueue interface
	* instead of cv/msleep in order to avoid
	@@ -1193,7 +1193,7 @@

	/* Reacquire locks previously released. */
	PICKUP_GIANT();
	- CC_LOCK(cc);
	+ goto again;
	}
	c->c_flags &= ~CALLOUT_ACTIVE;
	} else if (use_lock &&