From 6f858f49139bfe1e1b7a39efc5fc746511ab7098 Mon Sep 17 00:00:00 2001 From: Hiroshi Shimamoto Date: Wed, 30 Jan 2008 13:30:30 +0100 Subject: [PATCH] --- yaml --- r: 79786 b: refs/heads/master c: 52e3d90def24008c9b3435a1032d9a7f05766bce h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/io_apic_64.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f131ec10d40f..6c6d23286430 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 013d23e1567c4cebee0a2db5c8fa97b91b34ac2a +refs/heads/master: 52e3d90def24008c9b3435a1032d9a7f05766bce diff --git a/trunk/arch/x86/kernel/io_apic_64.c b/trunk/arch/x86/kernel/io_apic_64.c index c6de7854ac63..3e471d0fb150 100644 --- a/trunk/arch/x86/kernel/io_apic_64.c +++ b/trunk/arch/x86/kernel/io_apic_64.c @@ -1439,7 +1439,7 @@ static void ack_apic_level(unsigned int irq) int do_unmask_irq = 0; irq_complete_move(irq); -#if defined(CONFIG_GENERIC_PENDING_IRQ) || defined(CONFIG_IRQBALANCE) +#ifdef CONFIG_GENERIC_PENDING_IRQ /* If we are moving the irq we need to mask it */ if (unlikely(irq_desc[irq].status & IRQ_MOVE_PENDING)) { do_unmask_irq = 1;