svn commit: r215089 - stable/8/sys/x86/x86
Attilio Rao
attilio at FreeBSD.org
Wed Nov 10 14:59:14 UTC 2010
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.
More information about the svn-src-stable
mailing list