diff options
Diffstat (limited to 'arch/x86/kernel/io_apic.c')
-rw-r--r-- | arch/x86/kernel/io_apic.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/kernel/io_apic.c b/arch/x86/kernel/io_apic.c index 1cbf7c8d46e..3e070bb961d 100644 --- a/arch/x86/kernel/io_apic.c +++ b/arch/x86/kernel/io_apic.c | |||
@@ -2472,10 +2472,9 @@ static void set_ir_ioapic_affinity_irq(unsigned int irq, | |||
2472 | asmlinkage void smp_irq_move_cleanup_interrupt(void) | 2472 | asmlinkage void smp_irq_move_cleanup_interrupt(void) |
2473 | { | 2473 | { |
2474 | unsigned vector, me; | 2474 | unsigned vector, me; |
2475 | |||
2475 | ack_APIC_irq(); | 2476 | ack_APIC_irq(); |
2476 | #ifdef CONFIG_X86_64 | ||
2477 | exit_idle(); | 2477 | exit_idle(); |
2478 | #endif | ||
2479 | irq_enter(); | 2478 | irq_enter(); |
2480 | 2479 | ||
2481 | me = smp_processor_id(); | 2480 | me = smp_processor_id(); |
@@ -2520,7 +2519,7 @@ static void irq_complete_move(struct irq_desc **descp) | |||
2520 | if (likely(!cfg->move_desc_pending)) | 2519 | if (likely(!cfg->move_desc_pending)) |
2521 | return; | 2520 | return; |
2522 | 2521 | ||
2523 | /* domain is not change, but affinity is changed */ | 2522 | /* domain has not changed, but affinity did */ |
2524 | me = smp_processor_id(); | 2523 | me = smp_processor_id(); |
2525 | if (cpu_isset(me, desc->affinity)) { | 2524 | if (cpu_isset(me, desc->affinity)) { |
2526 | *descp = desc = move_irq_desc(desc, me); | 2525 | *descp = desc = move_irq_desc(desc, me); |