aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86_64/kernel
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2007-02-23 06:16:31 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-26 13:34:07 -0500
commita27bc06dd8ee6ad6394e8a76345660b93621b51b (patch)
tree99eb63480f0f9d1700676072601091a317808950 /arch/x86_64/kernel
parente560c8bd866bfa284b2c5978efcaf1bd16ee9fc3 (diff)
[PATCH] x86_64 irq: Remove the unused vector parameter from ioapic_register_intr
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/x86_64/kernel')
-rw-r--r--arch/x86_64/kernel/io_apic.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86_64/kernel/io_apic.c b/arch/x86_64/kernel/io_apic.c
index 2d154e1a6fd6..a69c38b62629 100644
--- a/arch/x86_64/kernel/io_apic.c
+++ b/arch/x86_64/kernel/io_apic.c
@@ -799,7 +799,7 @@ static struct irq_chip ioapic_chip;
799#define IOAPIC_EDGE 0 799#define IOAPIC_EDGE 0
800#define IOAPIC_LEVEL 1 800#define IOAPIC_LEVEL 1
801 801
802static void ioapic_register_intr(int irq, int vector, unsigned long trigger) 802static void ioapic_register_intr(int irq, unsigned long trigger)
803{ 803{
804 if ((trigger == IOAPIC_AUTO && IO_APIC_irq_trigger(irq)) || 804 if ((trigger == IOAPIC_AUTO && IO_APIC_irq_trigger(irq)) ||
805 trigger == IOAPIC_LEVEL) 805 trigger == IOAPIC_LEVEL)
@@ -847,7 +847,7 @@ static void __init setup_IO_APIC_irq(int apic, int pin, int idx, int irq)
847 entry.dest = cpu_mask_to_apicid(mask); 847 entry.dest = cpu_mask_to_apicid(mask);
848 entry.vector = vector; 848 entry.vector = vector;
849 849
850 ioapic_register_intr(irq, vector, IOAPIC_AUTO); 850 ioapic_register_intr(irq, IOAPIC_AUTO);
851 if (!apic && (irq < 16)) 851 if (!apic && (irq < 16))
852 disable_8259A_irq(irq); 852 disable_8259A_irq(irq);
853 } 853 }
@@ -2133,7 +2133,7 @@ int io_apic_set_pci_routing (int ioapic, int pin, int irq, int triggering, int p
2133 mp_ioapics[ioapic].mpc_apicid, pin, entry.vector, irq, 2133 mp_ioapics[ioapic].mpc_apicid, pin, entry.vector, irq,
2134 triggering, polarity); 2134 triggering, polarity);
2135 2135
2136 ioapic_register_intr(irq, entry.vector, triggering); 2136 ioapic_register_intr(irq, triggering);
2137 2137
2138 if (!ioapic && (irq < 16)) 2138 if (!ioapic && (irq < 16))
2139 disable_8259A_irq(irq); 2139 disable_8259A_irq(irq);