diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-05 21:49:47 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-05 21:49:47 +0100 |
| commit | 31bbed527e7039203920c51c9fb48c27aed0820c (patch) | |
| tree | 71fa6e963f4c3d876e83e44927e87d5394a7cf69 /arch/x86/include/asm/apic.h | |
| parent | 0fbba4871c42b297b0d6a6a6ff73e934cb91423e (diff) | |
| parent | b2b352590d94651579e6914ecdb08d30b2cb5f19 (diff) | |
Merge branch 'x86/uv' into x86/core
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 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) |