From owner-svn-src-stable@FreeBSD.ORG  Fri Oct  8 08:09:46 2010
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 16881106564A;
	Fri,  8 Oct 2010 08:09:46 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 04C0A8FC12;
	Fri,  8 Oct 2010 08:09:46 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9889jvu084019;
	Fri, 8 Oct 2010 08:09:45 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9889jMH084016;
	Fri, 8 Oct 2010 08:09:45 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201010080809.o9889jMH084016@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Fri, 8 Oct 2010 08:09:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r213559 - in stable/7/sys: gdb kern
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 08 Oct 2010 08:09:46 -0000

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);