projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
[powerpc.git]
/
include
/
asm-x86_64
/
hw_irq.h
diff --git
a/include/asm-x86_64/hw_irq.h
b/include/asm-x86_64/hw_irq.h
index
48a4a53
..
179cce7
100644
(file)
--- a/
include/asm-x86_64/hw_irq.h
+++ b/
include/asm-x86_64/hw_irq.h
@@
-19,8
+19,7
@@
#include <asm/irq.h>
#include <linux/profile.h>
#include <linux/smp.h>
#include <asm/irq.h>
#include <linux/profile.h>
#include <linux/smp.h>
-
-struct hw_interrupt_type;
+#include <linux/percpu.h>
#endif
#define NMI_VECTOR 0x02
#endif
#define NMI_VECTOR 0x02
@@
-75,9
+74,10
@@
struct hw_interrupt_type;
#ifndef __ASSEMBLY__
#ifndef __ASSEMBLY__
-extern u8 irq_vector[NR_IRQ_VECTORS];
-#define IO_APIC_VECTOR(irq) (irq_vector[irq])
-#define AUTO_ASSIGN -1
+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,
/*
* Various low-level irq details needed by irq.c, process.c,