diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-08-14 06:19:59 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-08-14 06:19:59 -0400 |
commit | 8d7ccaa545490cdffdfaff0842436a8dd85cf47b (patch) | |
tree | 8129b5907161bc6ae26deb3645ce1e280c5e1f51 /include/asm-x86/hw_irq.h | |
parent | b2139aa0eec330c711c5a279db361e5ef1178e78 (diff) | |
parent | 30a2f3c60a84092c8084dfe788b710f8d0768cd4 (diff) |
Merge commit 'v2.6.27-rc3' into x86/prototypes
Conflicts:
include/asm-x86/dma-mapping.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 67685f1d318d..91e368893ccf 100644 --- 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); | |||
118 | #else | 118 | #else |
119 | typedef int vector_irq_t[NR_VECTORS]; | 119 | typedef int vector_irq_t[NR_VECTORS]; |
120 | DECLARE_PER_CPU(vector_irq_t, vector_irq); | 120 | DECLARE_PER_CPU(vector_irq_t, vector_irq); |
121 | extern spinlock_t vector_lock; | ||
122 | #endif | 121 | #endif |
123 | extern void setup_vector_irq(int cpu); | 122 | |
123 | #if defined(CONFIG_X86_IO_APIC) && defined(CONFIG_X86_64) | ||
124 | extern void lock_vector_lock(void); | ||
125 | extern void unlock_vector_lock(void); | ||
126 | extern void __setup_vector_irq(int cpu); | ||
127 | #else | ||
128 | static inline void lock_vector_lock(void) {} | ||
129 | static inline void unlock_vector_lock(void) {} | ||
130 | static inline void __setup_vector_irq(int cpu) {} | ||
131 | #endif | ||
124 | 132 | ||
125 | #endif /* !ASSEMBLY_ */ | 133 | #endif /* !ASSEMBLY_ */ |
126 | 134 | ||