D37981.diff
No OneTemporary
Actions

Size

754 B

Referenced Files

None

Subscribers

None

D37981.diff
View Options

	diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c
	--- a/sys/kern/kern_shutdown.c
	+++ b/sys/kern/kern_shutdown.c
	@@ -270,8 +270,6 @@
	SHUTDOWN_PRI_LAST + 100);
	EVENTHANDLER_REGISTER(shutdown_final, shutdown_panic, NULL,
	SHUTDOWN_PRI_LAST + 100);
	- EVENTHANDLER_REGISTER(shutdown_final, shutdown_reset, NULL,
	- SHUTDOWN_PRI_LAST + 200);
	}

	SYSINIT(shutdown_conf, SI_SUB_INTRINSIC, SI_ORDER_ANY, shutdown_conf, NULL);
	@@ -548,6 +546,12 @@

	EVENTHANDLER_INVOKE(shutdown_final, howto);

	+ /*
	+ * Call this directly so that reset is attempted even if shutdown
	+ * handlers are not yet registered.
	+ */
	+ shutdown_reset(NULL, howto);
	+
	for(;;) ; /* safety against shutdown_reset not working */
	/* NOTREACHED */
	}