diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-01 01:58:36 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-01 01:58:36 -0500 |
| commit | 6946d28a9f47f50fe3dd916e8b4229de9769108e (patch) | |
| tree | eaa7499bf7fd367cbacf777d8eec8ed038ef287d /arch/i386/kernel/io_apic.c | |
| parent | 6c9e5eb522bca694a0311898039d2707e9bc7783 (diff) | |
| parent | 5666c0947ede0432ba5148570aa66ffb9febff5b (diff) | |
Merge branch 'master'
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 | ||