lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'linus' into x86/core

Browse Source 
Conflicts:
	arch/x86/kernel/genapic_64.c
	include/asm-x86/kvm_host.h

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar
2008-08-14 14:58:01 +02:00
parent b55793f752 b635acec48
commit 51ca3c6791
4673 changed files with 112385 additions and 45479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/asm-x86/hw_irq.h
View File

@@ -100,9 +100,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_ */