Signed-off-by: Andrew Morton --- arch/x86_64/kernel/apic.c | 17 ----------------- arch/x86_64/kernel/io_apic.c | 1 - 2 files changed, 18 deletions(-) diff -puN arch/x86_64/kernel/apic.c~x86_64-mm-remove-sync_arb_ids arch/x86_64/kernel/apic.c --- a/arch/x86_64/kernel/apic.c~x86_64-mm-remove-sync_arb_ids +++ a/arch/x86_64/kernel/apic.c @@ -283,23 +283,6 @@ int __init verify_local_APIC(void) return 1; } -void __init sync_Arb_IDs(void) -{ - /* Unsupported on P4 - see Intel Dev. Manual Vol. 3, Ch. 8.6.1 */ - unsigned int ver = GET_APIC_VERSION(apic_read(APIC_LVR)); - if (ver >= 0x14) /* P4 or higher */ - return; - - /* - * Wait for idle. - */ - 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); -} - /* * An initial setup of the virtual wire mode. */ diff -puN arch/x86_64/kernel/io_apic.c~x86_64-mm-remove-sync_arb_ids arch/x86_64/kernel/io_apic.c --- a/arch/x86_64/kernel/io_apic.c~x86_64-mm-remove-sync_arb_ids +++ a/arch/x86_64/kernel/io_apic.c @@ -1784,7 +1784,6 @@ void __init setup_IO_APIC(void) apic_printk(APIC_VERBOSE, "ENABLING IO-APIC IRQs\n"); - sync_Arb_IDs(); setup_IO_APIC_irqs(); init_IO_APIC_traps(); check_timer(); _