[tip:x86/uv] x86: UV, SGI RTC: add generic system vector, build fix on UP

Ingo Molnar
2009-03-05T14:19:33Z

Commit-ID: b2b352590d94651579e6914ecdb08d30b2cb5f19
Gitweb: http://git.kernel.org/tip/b2b352590d94651579e6914ecdb08d30b2cb5f19
Author: "Ingo Molnar" <mingo@elte.hu>
AuthorDate: Thu, 5 Mar 2009 15:15:44 +0100
Commit: Ingo Molnar <mingo@elte.hu>
CommitDate: Thu, 5 Mar 2009 15:15:56 +0100

x86: UV, SGI RTC: add generic system vector, build fix on UP

Make ack_APIC_irq() build on !SMP && !APIC too.

Cc: Dimitri Sivanich <sivanich@sgi.com>
LKML-Reference: <20090304185605.GA24419@sgi.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

---
arch/x86/include/asm/apic.h | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
index 4ef949c..394d177 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)