D8604.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D8604.diff
View Options

	Index: head/sys/kern/kern_synch.c
	===================================================================
	--- head/sys/kern/kern_synch.c
	+++ head/sys/kern/kern_synch.c
	@@ -152,8 +152,8 @@
	"Sleeping on \"%s\"", wmesg);
	KASSERT(sbt != 0 \|\| mtx_owned(&Giant) \|\| lock != NULL,
	("sleeping without a lock"));
	- KASSERT(p != NULL, ("msleep1"));
	- KASSERT(ident != NULL && TD_IS_RUNNING(td), ("msleep"));
	+ KASSERT(ident != NULL, ("_sleep: NULL ident"));
	+ KASSERT(TD_IS_RUNNING(td), ("_sleep: curthread not running"));
	if (priority & PDROP)
	KASSERT(lock != NULL && lock != &Giant.lock_object,
	("PDROP requires a non-Giant lock"));
	@@ -247,8 +247,8 @@
	td = curthread;
	p = td->td_proc;
	KASSERT(mtx != NULL, ("sleeping without a mutex"));
	- KASSERT(p != NULL, ("msleep1"));
	- KASSERT(ident != NULL && TD_IS_RUNNING(td), ("msleep"));
	+ KASSERT(ident != NULL, ("msleep_spin_sbt: NULL ident"));
	+ KASSERT(TD_IS_RUNNING(td), ("msleep_spin_sbt: curthread not running"));

	if (SCHEDULER_STOPPED())
	return (0);