d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Restore different APIC init orders for i386 and amd64 unified in r208452.

Browse Source 
Seems noone of them contents both arch for different reasons.

Submitted by:	kib@
This commit is contained in:
Alexander Motin 2010-05-24 01:49:00 +00:00
parent f7b46e74b3
commit ad384d144a
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=208479
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sys/x86/x86/local_apic.c
View File

@ -1195,8 +1195,9 @@ apic_register_enumerator(struct apic_enumerator *enumerator)
}
/*
* Probe the APIC enumerators, enumerate CPUs, and initialize the
* local APIC.
* We have to look for CPU's very, very early because certain subsystems
* want to know how many CPU's we have extremely early on in the boot
* process.
*/
static void
apic_init(void *dummy __unused)
@ -1257,13 +1258,34 @@ apic_init(void *dummy __unused)
printf("%s: Failed to probe CPUs: returned %d\n",
best_enum->apic_name, retval);
#ifdef __amd64__
}
SYSINIT(apic_init, SI_SUB_TUNABLES - 1, SI_ORDER_SECOND, apic_init, NULL);
/*
* Setup the local APIC. We have to do this prior to starting up the APs
* in the SMP case.
*/
static void
apic_setup_local(void *dummy __unused)
{
int retval;
if (best_enum == NULL)
return;
#endif
/* Third, initialize the local APIC. */
retval = best_enum->apic_setup_local();
if (retval != 0)
printf("%s: Failed to setup the local APIC: returned %d\n",
best_enum->apic_name, retval);
}
#ifdef __amd64__
SYSINIT(apic_setup_local, SI_SUB_CPU, SI_ORDER_SECOND, apic_setup_local,
NULL);
#else
SYSINIT(apic_init, SI_SUB_CPU, SI_ORDER_SECOND, apic_init, NULL);
#endif
/*
* Setup the I/O APICs.