From owner-svn-src-all@FreeBSD.ORG  Wed Nov 10 14:59:14 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 41444106564A;
	Wed, 10 Nov 2010 14:59:14 +0000 (UTC)
	(envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2F4798FC1F;
	Wed, 10 Nov 2010 14:59:14 +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 oAAExEZr022649;
	Wed, 10 Nov 2010 14:59:14 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAAExEOG022647;
	Wed, 10 Nov 2010 14:59:14 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201011101459.oAAExEOG022647@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Wed, 10 Nov 2010 14:59:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r215089 - stable/8/sys/x86/x86
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Nov 2010 14:59:14 -0000

Author: attilio
Date: Wed Nov 10 14:59:13 2010
New Revision: 215089
URL: http://svn.freebsd.org/changeset/base/215089

Log:
  Fix-up MFC r214446, r214516:
  Use the appropriate SYSINIT() ordering between the arches.
  This is intended as a fixup for r215059, so no further notes are merged.
  
  Reported by:	jhb
  Sponsored by:	Sandvine Incorporated

Modified:
  stable/8/sys/x86/x86/mptable.c

Modified: stable/8/sys/x86/x86/mptable.c
==============================================================================
--- stable/8/sys/x86/x86/mptable.c	Wed Nov 10 14:38:51 2010	(r215088)
+++ stable/8/sys/x86/x86/mptable.c	Wed Nov 10 14:59:13 2010	(r215089)
@@ -53,8 +53,10 @@ __FBSDID("$FreeBSD$");
 
 #ifdef __amd64__
 #define	MAX_LAPIC_ID		63	/* Max local APIC ID for HTT fixup */
+#define	SI_SUB_MPTBL		(SI_SUB_TUNABLES - 1)
 #else
 #define	MAX_LAPIC_ID		31	/* Max local APIC ID for HTT fixup */
+#define	SI_SUB_MPTBL		(SI_SUB_CPU - 1)
 #endif
 
 #ifdef PC98
@@ -389,8 +391,7 @@ mptable_register(void *dummy __unused)
 
 	apic_register_enumerator(&mptable_enumerator);
 }
-SYSINIT(mptable_register, SI_SUB_CPU - 1, SI_ORDER_FIRST, mptable_register,
-    NULL);
+SYSINIT(mptable_register, SI_SUB_MPTBL, SI_ORDER_FIRST, mptable_register, NULL);
 
 /*
  * Call the handler routine for each entry in the MP config table.