aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-10-25 20:21:16 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-25 20:21:16 -0700
commit9f4c7ac227423eb4a514ce0bbd3a884a26541e63 (patch)
tree8f2d8cdebfe87f11e0e7f14c789f807dbf0bec5d /include
parent8c8a0eab988c94294adbbb4fe955bba7d8ebddcf (diff)
parent70a0a5357db20c291d46c04011d646d5d84c868c (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.h2
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 792dd52fcd7..179cce755aa 100644
--- a/include/asm-x86_64/hw_irq.h
+++ b/include/asm-x86_64/hw_irq.h
@@ -76,6 +76,8 @@
#ifndef __ASSEMBLY__
typedef int vector_irq_t[NR_VECTORS];
DECLARE_PER_CPU(vector_irq_t, vector_irq);
+extern void __setup_vector_irq(int cpu);
+extern spinlock_t vector_lock;
/*
* Various low-level irq details needed by irq.c, process.c,