From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758886AbYJ3WHN (ORCPT ); Thu, 30 Oct 2008 18:07:13 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754211AbYJ3WG7 (ORCPT ); Thu, 30 Oct 2008 18:06:59 -0400 Received: from mx3.mail.elte.hu ([157.181.1.138]:56656 "EHLO mx3.mail.elte.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752972AbYJ3WG7 (ORCPT ); Thu, 30 Oct 2008 18:06:59 -0400 Date: Thu, 30 Oct 2008 23:06:53 +0100 From: Ingo Molnar To: James Bottomley Cc: Thomas Gleixner , Cyrill Gorcunov , linux-kernel Subject: Re: [PATCH] fix compile breakage caused by 2ae111cdd8d83ebf9de72e36e68a8c84b6ebbeea Message-ID: <20081030220653.GK30303@elte.hu> References: <1225400664.19324.16.camel@localhost.localdomain> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1225400664.19324.16.camel@localhost.localdomain> User-Agent: Mutt/1.5.18 (2008-05-17) X-ELTE-VirusStatus: clean X-ELTE-SpamScore: -1.5 X-ELTE-SpamLevel: X-ELTE-SpamCheck: no X-ELTE-SpamVersion: ELTE 2.0 X-ELTE-SpamCheck-Details: score=-1.5 required=5.9 tests=BAYES_00,DNS_FROM_SECURITYSAGE autolearn=no SpamAssassin version=3.2.3 -1.5 BAYES_00 BODY: Bayesian spam probability is 0 to 1% [score: 0.0000] 0.0 DNS_FROM_SECURITYSAGE RBL: Envelope sender in blackholes.securitysage.com Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org * James Bottomley wrote: > >From bd011c0cc51ce1fbab95403a570a8b47ad6ba500 Mon Sep 17 00:00:00 2001 > From: James Bottomley > Date: Wed, 29 Oct 2008 11:19:49 -0500 > Subject: [VOYAGER] x86: Fix subarch compile breakage > > commit 2ae111cdd8d83ebf9de72e36e68a8c84b6ebbeea > Author: Cyrill Gorcunov > Date: Mon Aug 11 18:34:08 2008 +0400 > > x86: apic interrupts - move assignments to irqinit_32.c, v2 > > Wrongly moved irq2 setup out of the mach-default/setup.c file. This > causes a breakage on voyager which needs its own version. Fix by > moving it back again. > > Signed-off-by: James Bottomley > --- > arch/x86/kernel/irqinit_32.c | 12 ------------ > arch/x86/mach-default/setup.c | 12 ++++++++++++ > 2 files changed, 12 insertions(+), 12 deletions(-) > > diff --git a/arch/x86/kernel/irqinit_32.c b/arch/x86/kernel/irqinit_32.c > index 845aa98..3928784 100644 > --- a/arch/x86/kernel/irqinit_32.c > +++ b/arch/x86/kernel/irqinit_32.c > @@ -81,15 +81,6 @@ void __init init_ISA_irqs (void) > } > } > > -/* > - * IRQ2 is cascade interrupt to second interrupt controller > - */ > -static struct irqaction irq2 = { > - .handler = no_action, > - .mask = CPU_MASK_NONE, > - .name = "cascade", > -}; > - > DEFINE_PER_CPU(vector_irq_t, vector_irq) = { > [0 ... IRQ0_VECTOR - 1] = -1, > [IRQ0_VECTOR] = 0, > @@ -167,9 +158,6 @@ void __init native_init_IRQ(void) > alloc_intr_gate(THERMAL_APIC_VECTOR, thermal_interrupt); > #endif > > - if (!acpi_ioapic) > - setup_irq(2, &irq2); > - > /* setup after call gates are initialised (usually add in > * the architecture specific gates) > */ > diff --git a/arch/x86/mach-default/setup.c b/arch/x86/mach-default/setup.c > index 37b9ae4..53b4202 100644 > --- a/arch/x86/mach-default/setup.c > +++ b/arch/x86/mach-default/setup.c > @@ -38,6 +38,15 @@ void __init pre_intr_init_hook(void) > init_ISA_irqs(); > } > > +/* > + * IRQ2 is cascade interrupt to second interrupt controller > + */ > +static struct irqaction irq2 = { > + .handler = no_action, > + .mask = CPU_MASK_NONE, > + .name = "cascade", > +}; > + > /** > * intr_init_hook - post gate setup interrupt initialisation > * > @@ -53,6 +62,9 @@ void __init intr_init_hook(void) > if (x86_quirks->arch_intr_init()) > return; > } > + if (!acpi_ioapic) > + setup_irq(2, &irq2); > + > } hm, this change looks backwards (doubly so ;-). Is the build problem caused by the lack of the acpi_ioapic flag on Voyager? Ingo