diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2009-03-05 15:15:44 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-05 15:15:56 +0100 |
| commit | b2b352590d94651579e6914ecdb08d30b2cb5f19 (patch) | |
| tree | d325fc379917c1368c9963ac9fc8eaa7b666b0aa /arch/x86/include/asm/apic.h | |
| parent | x86: UV, SGI RTC: fix uv_time.c for UP (diff) | |
| download | linux-dev-b2b352590d94651579e6914ecdb08d30b2cb5f19.tar.xz linux-dev-b2b352590d94651579e6914ecdb08d30b2cb5f19.zip | |
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>
Diffstat (limited to 'arch/x86/include/asm/apic.h')
| -rw-r--r-- | 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 4ef949c1972e..394d177d721b 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) |