Merge branch 'x86/uv' into x86/core

1 files changed, 2 insertions, 0 deletions

diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
index 4ef949c1972..394d177d721 100644
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -379,6 +379,7 @@ static inline u32 safe_apic_wait_icr_idle(void)
 
 static inline void ack_APIC_irq(void)
 {
+#ifdef CONFIG_X86_LOCAL_APIC
         /*
          * ack_APIC_irq() actually gets compiled as a single instruction
          * ... yummie.
@@ -386,6 +387,7 @@ static inline void ack_APIC_irq(void)
 
         /* Docs say use 0 for future compatibility */
         apic_write(APIC_EOI, 0);
+#endif
 }
 
 static inline unsigned default_get_apic_id(unsigned long x)