[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-b2b352590d94651579e6914ecdb08d30b2cb5f19@git.kernel.org>
Date: Thu, 5 Mar 2009 14:18:48 GMT
From: Ingo Molnar <mingo@...e.hu>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
tglx@...utronix.de, sivanich@....com, mingo@...e.hu
Subject: [tip:x86/uv] x86: UV, SGI RTC: add generic system vector, build fix on UP
Commit-ID: b2b352590d94651579e6914ecdb08d30b2cb5f19
Gitweb: http://git.kernel.org/tip/b2b352590d94651579e6914ecdb08d30b2cb5f19
Author: "Ingo Molnar" <mingo@...e.hu>
AuthorDate: Thu, 5 Mar 2009 15:15:44 +0100
Commit: Ingo Molnar <mingo@...e.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@....com>
LKML-Reference: <20090304185605.GA24419@....com>
Signed-off-by: Ingo Molnar <mingo@...e.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)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists