svn commit: r322596 - head/sys/sys

[Conrad Meyer]

Author: cem
Date: Wed Aug 16 21:42:27 2017
New Revision: 322596
URL: https://svnweb.freebsd.org/changeset/base/322596

Log:
  Add SI_SUB_TASKQ after SI_SUB_INTR and move taskqueue initialization there for EARLY_AP_STARTUP
  
  This fixes a regression accidentally introduced in r322588, due to an
  interaction with EARLY_AP_STARTUP.
  
  Reviewed by:	bdrewery@, jhb@
  Sponsored by:	Dell EMC Isilon
  Differential Revision:	https://reviews.freebsd.org/D12053

Modified:
  head/sys/sys/kernel.h
  head/sys/sys/taskqueue.h

Modified: head/sys/sys/kernel.h
==============================================================================
--- head/sys/sys/kernel.h	Wed Aug 16 20:29:00 2017	(r322595)
+++ head/sys/sys/kernel.h	Wed Aug 16 21:42:27 2017	(r322596)
@@ -118,6 +118,7 @@ enum sysinit_sub_id {
 	SI_SUB_SCHED_IDLE	= 0x2600000,	/* required idle procs */
 	SI_SUB_MBUF		= 0x2700000,	/* mbuf subsystem */
 	SI_SUB_INTR		= 0x2800000,	/* interrupt threads */
+	SI_SUB_TASKQ		= 0x2880000,	/* task queues */
 #ifdef EARLY_AP_STARTUP
 	SI_SUB_SMP		= 0x2900000,	/* start the APs*/
 #endif

Modified: head/sys/sys/taskqueue.h
==============================================================================
--- head/sys/sys/taskqueue.h	Wed Aug 16 20:29:00 2017	(r322595)
+++ head/sys/sys/taskqueue.h	Wed Aug 16 21:42:27 2017	(r322596)
@@ -149,7 +149,7 @@ taskqueue_define_##name(void *arg)					\
 	init;								\
 }									\
 									\
-SYSINIT(taskqueue_##name, SI_SUB_INIT_IF, SI_ORDER_SECOND,		\
+SYSINIT(taskqueue_##name, SI_SUB_TASKQ, SI_ORDER_SECOND,		\
 	taskqueue_define_##name, NULL);					\
 									\
 struct __hack
@@ -174,7 +174,7 @@ taskqueue_define_##name(void *arg)					\
 	init;								\
 }									\
 									\
-SYSINIT(taskqueue_##name, SI_SUB_INIT_IF, SI_ORDER_SECOND,		\
+SYSINIT(taskqueue_##name, SI_SUB_TASKQ, SI_ORDER_SECOND,		\
 	taskqueue_define_##name, NULL);					\
 									\
 struct __hack