From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: build failure after merge of the Linus' tree Date: Wed, 30 Mar 2011 11:00:27 +1100 Message-ID: <20110330110027.b83a1d20.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: Received: from chilli.pcug.org.au ([203.10.76.44]:32894 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751683Ab1C3AAg (ORCPT ); Tue, 29 Mar 2011 20:00:36 -0400 Sender: linux-next-owner@vger.kernel.org List-ID: To: Linus Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Thomas Gleixner , ppc-dev Hi all, After merging the Linus' tree, today's linux-next build (powerpc ppc64_defconfig) failed like this: kernel/irq/chip.c: In function 'handle_edge_eoi_irq': kernel/irq/chip.c:517: warning: label 'out_unlock' defined but not used kernel/irq/chip.c:503: error: label 'out_eoi' used but not defined Caused by commit 0521c8fbb3da ("genirq: Provide edge_eoi flow handler") which was clearly not even built with CONFIG_IRQ_EDGE_EOI_HANDLER defined. I applied this fixup patch: From: Stephen Rothwell Date: Wed, 30 Mar 2011 10:55:12 +1100 Subject: [PATCH] genirq: fix CONFIG_IRQ_EDGE_EOI_HANDLER build Fixes these errors: kernel/irq/chip.c: In function 'handle_edge_eoi_irq': kernel/irq/chip.c:517: warning: label 'out_unlock' defined but not used kernel/irq/chip.c:503: error: label 'out_eoi' used but not defined Signed-off-by: Stephen Rothwell --- kernel/irq/chip.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c index 616ec1c..1dafc86 100644 --- a/kernel/irq/chip.c +++ b/kernel/irq/chip.c @@ -514,7 +514,7 @@ void handle_edge_eoi_irq(unsigned int irq, struct irq_desc *desc) } while ((desc->istate & IRQS_PENDING) && !irqd_irq_disabled(&desc->irq_data)); -out_unlock: +out_eoi: chip->irq_eoi(&desc->irq_data); raw_spin_unlock(&desc->lock); } -- 1.7.4.1 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/