Commit 296cb951 authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Ingo Molnar
Browse files

x86: apic - unify sync_Arb_IDs 



Signed-off-by: default avatarCyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent c93baa1a

arch/x86/kernel/apic_32.c

+1 −2
Original line number Diff line number Diff line
@@ -915,8 +915,7 @@ void __init sync_Arb_IDs(void) 
	apic_wait_icr_idle();



	apic_printk(APIC_DEBUG, "Synchronizing Arb IDs.\n");

	apic_write(APIC_ICR,

		   APIC_DEST_ALLINC | APIC_INT_LEVELTRIG | APIC_DM_INIT);

	apic_write(APIC_ICR, APIC_DEST_ALLINC | APIC_INT_LEVELTRIG | APIC_DM_INIT);

}



/*

arch/x86/kernel/apic_64.c

+6 −4
Original line number Diff line number Diff line
@@ -742,8 +742,11 @@ int __init verify_local_APIC(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;



	/*
@@ -752,8 +755,7 @@ void __init sync_Arb_IDs(void) 
	apic_wait_icr_idle();



	apic_printk(APIC_DEBUG, "Synchronizing Arb IDs.\n");

	apic_write(APIC_ICR, APIC_DEST_ALLINC | APIC_INT_LEVELTRIG

				| APIC_DM_INIT);

	apic_write(APIC_ICR, APIC_DEST_ALLINC | APIC_INT_LEVELTRIG | APIC_DM_INIT);

}



/*