Merge commit 'v2.6.27-rc3' into x86/prototypes

[linux-2.6-omap-h63xx.git] / include / asm-x86 / hw_irq.h

diff --git a/include/asm-x86/hw_irq.h b/include/asm-x86/hw_irq.h
index 67685f1d318d1b55285f970db9d80ba19f9a0371..91e368893ccf0134cf98f478252ba4fe68c70162 100644 (file)
--- a/include/asm-x86/hw_irq.h
+++ b/include/asm-x86/hw_irq.h
@@ -118,9 +118,17 @@ extern void (*const interrupt[NR_IRQS])(void);
 #else
 typedef int vector_irq_t[NR_VECTORS];
 DECLARE_PER_CPU(vector_irq_t, vector_irq);
-extern spinlock_t vector_lock;
 #endif
-extern void setup_vector_irq(int cpu);
+
+#if defined(CONFIG_X86_IO_APIC) && defined(CONFIG_X86_64)
+extern void lock_vector_lock(void);
+extern void unlock_vector_lock(void);
+extern void __setup_vector_irq(int cpu);
+#else
+static inline void lock_vector_lock(void) {}
+static inline void unlock_vector_lock(void) {}
+static inline void __setup_vector_irq(int cpu) {}
+#endif
 
 #endif /* !ASSEMBLY_ */