From 6de28f9cdd37a6ca79a8f6652b686bf9906a0e0c Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Thu, 5 Mar 2009 15:15:44 +0100 Subject: [PATCH] --- yaml --- r: 138692 b: refs/heads/master c: b2b352590d94651579e6914ecdb08d30b2cb5f19 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/include/asm/apic.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index b72679372675..ae5a4fe822ef 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1400b3faab8fedfffde5a7fe47098e2732d4aa76 +refs/heads/master: b2b352590d94651579e6914ecdb08d30b2cb5f19 diff --git a/trunk/arch/x86/include/asm/apic.h b/trunk/arch/x86/include/asm/apic.h index 4ef949c1972e..394d177d721b 100644 --- a/trunk/arch/x86/include/asm/apic.h +++ b/trunk/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)