svn commit: r337042 - stable/10/sys/sys

[Hans Petter Selasky]

Author: hselasky
Date: Wed Aug  1 13:13:43 2018
New Revision: 337042
URL: https://svnweb.freebsd.org/changeset/base/337042

Log:
  MFC r322596:
  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:
  stable/10/sys/sys/kernel.h
  stable/10/sys/sys/taskqueue.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/sys/kernel.h
==============================================================================
--- stable/10/sys/sys/kernel.h	Wed Aug  1 12:49:51 2018	(r337041)
+++ stable/10/sys/sys/kernel.h	Wed Aug  1 13:13:43 2018	(r337042)
@@ -127,8 +127,9 @@ 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_SOFTINTR		= 0x2800001,	/* start soft interrupt thread */
+	SI_SUB_TASKQ		= 0x2880000,	/* task queues */
 	SI_SUB_ACL		= 0x2900000,	/* start for filesystem ACLs */
+	SI_SUB_SOFTINTR		= 0x2A00000,	/* start soft interrupt thread */
 	SI_SUB_DEVFS		= 0x2F00000,	/* devfs ready for devices */
 	SI_SUB_INIT_IF		= 0x3000000,	/* prep for net interfaces */
 	SI_SUB_NETGRAPH		= 0x3010000,	/* Let Netgraph initialize */

Modified: stable/10/sys/sys/taskqueue.h
==============================================================================
--- stable/10/sys/sys/taskqueue.h	Wed Aug  1 12:49:51 2018	(r337041)
+++ stable/10/sys/sys/taskqueue.h	Wed Aug  1 13:13:43 2018	(r337042)
@@ -141,7 +141,7 @@ taskqueue_define_##name(void *arg)					\
 	init;								\
 }									\
 									\
-SYSINIT(taskqueue_##name, SI_SUB_CONFIGURE, SI_ORDER_SECOND,		\
+SYSINIT(taskqueue_##name, SI_SUB_TASKQ, SI_ORDER_SECOND,		\
 	taskqueue_define_##name, NULL);					\
 									\
 struct __hack
@@ -166,7 +166,7 @@ taskqueue_define_##name(void *arg)					\
 	init;								\
 }									\
 									\
-SYSINIT(taskqueue_##name, SI_SUB_CONFIGURE, SI_ORDER_SECOND,		\
+SYSINIT(taskqueue_##name, SI_SUB_TASKQ, SI_ORDER_SECOND,		\
 	taskqueue_define_##name, NULL);					\
 									\
 struct __hack