diff --git a/[refs] b/[refs] index b8f5997acce7..b51122fd152f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1b9b89e7f163336ad84200b66a17284dbf26aced +refs/heads/master: df1be4372eae5f104b7fb4991bc4b35f00b11a11 diff --git a/trunk/include/asm-x86/apic.h b/trunk/include/asm-x86/apic.h index 51339910fdc0..502ca6594b1d 100644 --- a/trunk/include/asm-x86/apic.h +++ b/trunk/include/asm-x86/apic.h @@ -136,11 +136,7 @@ static inline void ack_APIC_irq(void) */ /* Docs say use 0 for future compatibility */ -#ifdef CONFIG_X86_32 apic_write(APIC_EOI, 0); -#else - native_apic_mem_write(APIC_EOI, 0); -#endif } extern int lapic_get_maxlvt(void);