svn commit: r213558 - in stable/8/sys: gdb kern sys

[Andriy Gapon]

Author: avg
Date: Fri Oct  8 08:01:36 2010
New Revision: 213558
URL: http://svn.freebsd.org/changeset/base/213558

Log:
  MFC r213305: there must be only one SYSINIT with
  SI_SUB_RUN_SCHEDULER+SI_ORDER_ANY order

Modified:
  stable/8/sys/gdb/gdb_cons.c
  stable/8/sys/kern/kern_ntptime.c
  stable/8/sys/sys/sched.h
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/gdb/gdb_cons.c
==============================================================================
--- stable/8/sys/gdb/gdb_cons.c	Fri Oct  8 07:58:57 2010	(r213557)
+++ stable/8/sys/gdb/gdb_cons.c	Fri Oct  8 08:01:36 2010	(r213558)
@@ -126,7 +126,7 @@ oktousecallout(void *data __unused)
 {
 	calloutok = 1;
 }
-SYSINIT(gdbhack, SI_SUB_RUN_SCHEDULER, SI_ORDER_ANY, oktousecallout, NULL);
+SYSINIT(gdbhack, SI_SUB_RUN_SCHEDULER, SI_ORDER_MIDDLE, oktousecallout, NULL);
 
 static void
 gdb_cnputc(struct consdev *cp, int c)

Modified: stable/8/sys/kern/kern_ntptime.c
==============================================================================
--- stable/8/sys/kern/kern_ntptime.c	Fri Oct  8 07:58:57 2010	(r213557)
+++ stable/8/sys/kern/kern_ntptime.c	Fri Oct  8 08:01:36 2010	(r213558)
@@ -1035,5 +1035,5 @@ start_periodic_resettodr(void *arg __unu
 	    periodic_resettodr, NULL);
 }
 
-SYSINIT(periodic_resettodr, SI_SUB_RUN_SCHEDULER, SI_ORDER_ANY - 1,
+SYSINIT(periodic_resettodr, SI_SUB_RUN_SCHEDULER, SI_ORDER_MIDDLE,
 	start_periodic_resettodr, NULL);

Modified: stable/8/sys/sys/sched.h
==============================================================================
--- stable/8/sys/sys/sched.h	Fri Oct  8 07:58:57 2010	(r213557)
+++ stable/8/sys/sys/sched.h	Fri Oct  8 08:01:36 2010	(r213558)
@@ -173,7 +173,7 @@ static void name ## _add_proc(void *dumm
 	    #name, CTLTYPE_LONG|CTLFLAG_RD|CTLFLAG_MPSAFE,		\
 	    ptr, 0, sysctl_dpcpu_long, "LU", descr);			\
 }									\
-SYSINIT(name, SI_SUB_RUN_SCHEDULER, SI_ORDER_ANY, name ## _add_proc, NULL);
+SYSINIT(name, SI_SUB_RUN_SCHEDULER, SI_ORDER_MIDDLE, name ## _add_proc, NULL);
 
 #define	SCHED_STAT_DEFINE(name, descr)					\
     DPCPU_DEFINE(unsigned long, name);					\