aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/kernel/apic_32.c4
-rw-r--r--arch/x86/kernel/apic_64.c3
2 files changed, 5 insertions, 2 deletions
diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c
index d07488993ee7..60575c05151a 100644
--- a/arch/x86/kernel/apic_32.c
+++ b/arch/x86/kernel/apic_32.c
@@ -909,13 +909,15 @@ void __init sync_Arb_IDs(void)
909 */ 909 */
910 if (modern_apic() || boot_cpu_data.x86_vendor == X86_VENDOR_AMD) 910 if (modern_apic() || boot_cpu_data.x86_vendor == X86_VENDOR_AMD)
911 return; 911 return;
912
912 /* 913 /*
913 * Wait for idle. 914 * Wait for idle.
914 */ 915 */
915 apic_wait_icr_idle(); 916 apic_wait_icr_idle();
916 917
917 apic_printk(APIC_DEBUG, "Synchronizing Arb IDs.\n"); 918 apic_printk(APIC_DEBUG, "Synchronizing Arb IDs.\n");
918 apic_write(APIC_ICR, APIC_DEST_ALLINC | APIC_INT_LEVELTRIG | APIC_DM_INIT); 919 apic_write(APIC_ICR, APIC_DEST_ALLINC |
920 APIC_INT_LEVELTRIG | APIC_DM_INIT);
919} 921}
920 922
921/* 923/*
diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c
index 41aff3460635..72e94ab0e364 100644
--- a/arch/x86/kernel/apic_64.c
+++ b/arch/x86/kernel/apic_64.c
@@ -755,7 +755,8 @@ void __init sync_Arb_IDs(void)
755 apic_wait_icr_idle(); 755 apic_wait_icr_idle();
756 756
757 apic_printk(APIC_DEBUG, "Synchronizing Arb IDs.\n"); 757 apic_printk(APIC_DEBUG, "Synchronizing Arb IDs.\n");
758 apic_write(APIC_ICR, APIC_DEST_ALLINC | APIC_INT_LEVELTRIG | APIC_DM_INIT); 758 apic_write(APIC_ICR, APIC_DEST_ALLINC |
759 APIC_INT_LEVELTRIG | APIC_DM_INIT);
759} 760}
760 761
761/* 762/*