x86: apic - unify sync_Arb_IDs

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Cyrill Gorcunov 2008-08-15 13:51:23 +02:00 committed by Ingo Molnar
parent c93baa1ae5
commit 296cb9511d
2 changed files with 7 additions and 6 deletions

View File

@ -915,8 +915,7 @@ void __init sync_Arb_IDs(void)
apic_wait_icr_idle(); apic_wait_icr_idle();
apic_printk(APIC_DEBUG, "Synchronizing Arb IDs.\n"); apic_printk(APIC_DEBUG, "Synchronizing Arb IDs.\n");
apic_write(APIC_ICR, apic_write(APIC_ICR, APIC_DEST_ALLINC | APIC_INT_LEVELTRIG | APIC_DM_INIT);
APIC_DEST_ALLINC | APIC_INT_LEVELTRIG | APIC_DM_INIT);
} }
/* /*

View File

@ -742,8 +742,11 @@ int __init verify_local_APIC(void)
*/ */
void __init sync_Arb_IDs(void) void __init sync_Arb_IDs(void)
{ {
/* Unsupported on P4 - see Intel Dev. Manual Vol. 3, Ch. 8.6.1 */ /*
if (modern_apic()) * Unsupported on P4 - see Intel Dev. Manual Vol. 3, Ch. 8.6.1 And not
* needed on AMD.
*/
if (modern_apic() || boot_cpu_data.x86_vendor == X86_VENDOR_AMD)
return; return;
/* /*
@ -752,8 +755,7 @@ void __init sync_Arb_IDs(void)
apic_wait_icr_idle(); apic_wait_icr_idle();
apic_printk(APIC_DEBUG, "Synchronizing Arb IDs.\n"); apic_printk(APIC_DEBUG, "Synchronizing Arb IDs.\n");
apic_write(APIC_ICR, APIC_DEST_ALLINC | APIC_INT_LEVELTRIG apic_write(APIC_ICR, APIC_DEST_ALLINC | APIC_INT_LEVELTRIG | APIC_DM_INIT);
| APIC_DM_INIT);
} }
/* /*