diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2006-10-04 05:16:47 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 10:55:28 -0400 |
commit | ace80ab796ae30d2c9ee8a84ab6f608a61f8b87b (patch) | |
tree | 05eb2c68e534af4982ad82c459b1a65e3e712faf /include/asm-i386/hw_irq.h | |
parent | 04b9267b15206fc902a18de1f78de6c82ca47716 (diff) |
[PATCH] genirq: i386 irq: Remove the msi assumption that irq == vector
This patch removes the change in behavior of the irq allocation code when
CONFIG_PCI_MSI is defined. Removing all instances of the assumption that irq
== vector.
create_irq is rewritten to first allocate a free irq and then to assign that
irq a vector.
assign_irq_vector is made static and the AUTO_ASSIGN case which allocates an
vector not bound to an irq is removed.
The ioapic vector methods are removed, and everything now works with irqs.
The definition of NR_IRQS no longer depends on CONFIG_PCI_MSI
[akpm@osdl.org: cleanup]
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Rajesh Shah <rajesh.shah@intel.com>
Cc: Andi Kleen <ak@muc.de>
Cc: "Protasevich, Natalie" <Natalie.Protasevich@UNISYS.com>
Cc: "Luck, Tony" <tony.luck@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-i386/hw_irq.h')
-rw-r--r-- | include/asm-i386/hw_irq.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-i386/hw_irq.h b/include/asm-i386/hw_irq.h index 8e8fbfaa252a..88f02a073561 100644 --- a/include/asm-i386/hw_irq.h +++ b/include/asm-i386/hw_irq.h | |||
@@ -28,7 +28,6 @@ | |||
28 | 28 | ||
29 | extern u8 irq_vector[NR_IRQ_VECTORS]; | 29 | extern u8 irq_vector[NR_IRQ_VECTORS]; |
30 | #define IO_APIC_VECTOR(irq) (irq_vector[irq]) | 30 | #define IO_APIC_VECTOR(irq) (irq_vector[irq]) |
31 | #define AUTO_ASSIGN -1 | ||
32 | 31 | ||
33 | extern void (*interrupt[NR_IRQS])(void); | 32 | extern void (*interrupt[NR_IRQS])(void); |
34 | 33 | ||