svn commit: r213559 - in stable/7/sys: gdb kern

[Andriy Gapon]

Author: avg
Date: Fri Oct  8 08:09:45 2010
New Revision: 213559
URL: http://svn.freebsd.org/changeset/base/213559

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

Modified:
  stable/7/sys/gdb/gdb_cons.c
  stable/7/sys/kern/kern_ntptime.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/gdb/gdb_cons.c
==============================================================================
--- stable/7/sys/gdb/gdb_cons.c	Fri Oct  8 08:01:36 2010	(r213558)
+++ stable/7/sys/gdb/gdb_cons.c	Fri Oct  8 08:09:45 2010	(r213559)
@@ -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/7/sys/kern/kern_ntptime.c
==============================================================================
--- stable/7/sys/kern/kern_ntptime.c	Fri Oct  8 08:01:36 2010	(r213558)
+++ stable/7/sys/kern/kern_ntptime.c	Fri Oct  8 08:09:45 2010	(r213559)
@@ -1037,5 +1037,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);