D43571.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D43571.diff
View Options

	diff --git a/sys/sys/kassert.h b/sys/sys/kassert.h
	--- a/sys/sys/kassert.h
	+++ b/sys/sys/kassert.h
	@@ -179,17 +179,6 @@
	#define CRITICAL_ASSERT(td) \
	KASSERT((td)->td_critnest >= 1, ("Not in critical section"))

	-/*
	- * If we have already panic'd and this is the thread that called
	- * panic(), then don't block on any mutexes but silently succeed.
	- * Otherwise, the kernel will deadlock since the scheduler isn't
	- * going to run the thread that holds any lock we need.
	- */
	-#define SCHEDULER_STOPPED_TD(td) ({ \
	- MPASS((td) == curthread); \
	- __predict_false((td)->td_stopsched); \
	-})
	-#define SCHEDULER_STOPPED() SCHEDULER_STOPPED_TD(curthread)
	#endif /* _KERNEL */

	#endif /* _SYS_KASSERT_H_ */
	diff --git a/sys/sys/systm.h b/sys/sys/systm.h
	--- a/sys/sys/systm.h
	+++ b/sys/sys/systm.h
	@@ -99,6 +99,18 @@
	#include <sys/pcpu.h> /* curthread */
	#include <sys/kpilite.h>

	+/*
	+ * If we have already panic'd and this is the thread that called
	+ * panic(), then don't block on any mutexes but silently succeed.
	+ * Otherwise, the kernel will deadlock since the scheduler isn't
	+ * going to run the thread that holds any lock we need.
	+ */
	+#define SCHEDULER_STOPPED_TD(td) ({ \
	+ MPASS((td) == curthread); \
	+ __predict_false((td)->td_stopsched); \
	+})
	+#define SCHEDULER_STOPPED() SCHEDULER_STOPPED_TD(curthread)
	+
	extern int osreldate;

	extern const void zero_region; / address space maps to a zeroed page */