Merge branch 'x86/apic' into x86/x2apic

[sfrench/cifs-2.6.git] / include / asm-x86 / mach-es7000 / mach_apic.h

diff --git a/include/asm-x86/mach-es7000/mach_apic.h b/include/asm-x86/mach-es7000/mach_apic.h
index b3556ec3bca50e9bfcd28326423fd5652e6c2117..63b4d9c189bf92327ec63b8d421b67acdb5f619f 100644 (file)
--- a/include/asm-x86/mach-es7000/mach_apic.h
+++ b/include/asm-x86/mach-es7000/mach_apic.h
@@ -66,9 +66,9 @@ static inline void init_apic_ldr(void)
        unsigned long val;
        int cpu = smp_processor_id();
 
-       apic_write_around(APIC_DFR, APIC_DFR_VALUE);
+       apic_write(APIC_DFR, APIC_DFR_VALUE);
        val = calculate_ldr(cpu);
-       apic_write_around(APIC_LDR, val);
+       apic_write(APIC_LDR, val);
 }
 
 #ifndef CONFIG_X86_GENERICARCH