diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-25 23:21:16 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-25 23:21:16 -0400 |
| commit | 9f4c7ac227423eb4a514ce0bbd3a884a26541e63 (patch) | |
| tree | 8f2d8cdebfe87f11e0e7f14c789f807dbf0bec5d /include | |
| parent | 8c8a0eab988c94294adbbb4fe955bba7d8ebddcf (diff) | |
| parent | 70a0a5357db20c291d46c04011d646d5d84c868c (diff) | |
Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6
* 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6:
[PATCH] x86-64: Only look at per_cpu data for online cpus.
[PATCH] x86-64: Simplify the vector allocator.
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-x86_64/hw_irq.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-x86_64/hw_irq.h b/include/asm-x86_64/hw_irq.h index 792dd52fcd70..179cce755aa7 100644 --- a/include/asm-x86_64/hw_irq.h +++ b/include/asm-x86_64/hw_irq.h | |||
| @@ -76,6 +76,8 @@ | |||
| 76 | #ifndef __ASSEMBLY__ | 76 | #ifndef __ASSEMBLY__ |
| 77 | typedef int vector_irq_t[NR_VECTORS]; | 77 | typedef int vector_irq_t[NR_VECTORS]; |
| 78 | DECLARE_PER_CPU(vector_irq_t, vector_irq); | 78 | DECLARE_PER_CPU(vector_irq_t, vector_irq); |
| 79 | extern void __setup_vector_irq(int cpu); | ||
| 80 | extern spinlock_t vector_lock; | ||
| 79 | 81 | ||
| 80 | /* | 82 | /* |
| 81 | * Various low-level irq details needed by irq.c, process.c, | 83 | * Various low-level irq details needed by irq.c, process.c, |