diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2005-11-30 00:45:31 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2005-11-30 00:45:31 -0500 |
| commit | 01fc99864ecc678c4f1f476b2a8b64ebcb14e733 (patch) | |
| tree | 947696fdb2f76609d1a079aa6ff57a22e490d803 /arch/i386/kernel/io_apic.c | |
| parent | a880b11a95fab4618da412d99fc7365d723e702d (diff) | |
| parent | d2ef5ebb4c4fe141a82252d4db8d8521e6765c5a (diff) | |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/i386/kernel/io_apic.c')
| -rw-r--r-- | arch/i386/kernel/io_apic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/i386/kernel/io_apic.c b/arch/i386/kernel/io_apic.c index cc5d7ac5b2e7..22c8675c79f4 100644 --- a/arch/i386/kernel/io_apic.c +++ b/arch/i386/kernel/io_apic.c | |||
| @@ -2009,7 +2009,7 @@ static void ack_edge_ioapic_vector(unsigned int vector) | |||
| 2009 | { | 2009 | { |
| 2010 | int irq = vector_to_irq(vector); | 2010 | int irq = vector_to_irq(vector); |
| 2011 | 2011 | ||
| 2012 | move_irq(vector); | 2012 | move_native_irq(vector); |
| 2013 | ack_edge_ioapic_irq(irq); | 2013 | ack_edge_ioapic_irq(irq); |
| 2014 | } | 2014 | } |
| 2015 | 2015 | ||
| @@ -2024,7 +2024,7 @@ static void end_level_ioapic_vector (unsigned int vector) | |||
| 2024 | { | 2024 | { |
| 2025 | int irq = vector_to_irq(vector); | 2025 | int irq = vector_to_irq(vector); |
| 2026 | 2026 | ||
| 2027 | move_irq(vector); | 2027 | move_native_irq(vector); |
| 2028 | end_level_ioapic_irq(irq); | 2028 | end_level_ioapic_irq(irq); |
| 2029 | } | 2029 | } |
| 2030 | 2030 | ||