diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-10 06:35:40 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-10 06:35:40 (GMT) |
| commit | 429b022af41108f6942d72547592b1d30e9a51f0 (patch) | |
| tree | 7d68355529718018cdad1241285816c6f64620b2 /include/asm-x86/hw_irq.h | |
| parent | 0cd418ddb1ee88df7d16d5df06cb2da68eceb9e4 (diff) | |
| parent | adee14b2e1557d0a8559f29681732d05a89dfc35 (diff) | |
| download | linux-fsl-qoriq-429b022af41108f6942d72547592b1d30e9a51f0.tar.xz | |
Merge commit 'v2.6.27-rc6' into core/rcu
Diffstat (limited to 'include/asm-x86/hw_irq.h')
| -rw-r--r-- | include/asm-x86/hw_irq.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/include/asm-x86/hw_irq.h b/include/asm-x86/hw_irq.h index 77ba51d..edd0b95 100644 --- a/include/asm-x86/hw_irq.h +++ b/include/asm-x86/hw_irq.h @@ -98,9 +98,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_ */ |