LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Cyrill Gorcunov <gorcunov@gmail.com>
To: Ingo Molnar <mingo@elte.hu>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>,
	Thomas Gleixner <tglx@linutronix.de>,
	linux-kernel <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] fix compile breakage caused by 2ae111cdd8d83ebf9de72e36e68a8c84b6ebbeea
Date: Fri, 31 Oct 2008 20:30:10 +0300	[thread overview]
Message-ID: <20081031173010.GA20803@localhost> (raw)
In-Reply-To: <20081030220653.GK30303@elte.hu>

[Ingo Molnar - Thu, Oct 30, 2008 at 11:06:53PM +0100]
| 
| * James Bottomley <James.Bottomley@HansenPartnership.com> wrote:
| 
| > >From bd011c0cc51ce1fbab95403a570a8b47ad6ba500 Mon Sep 17 00:00:00 2001
| > From: James Bottomley <James.Bottomley@HansenPartnership.com>
| > Date: Wed, 29 Oct 2008 11:19:49 -0500
| > Subject: [VOYAGER] x86: Fix subarch compile breakage
| > 
| > commit 2ae111cdd8d83ebf9de72e36e68a8c84b6ebbeea
| > Author: Cyrill Gorcunov <gorcunov@gmail.com>
| > 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 <James.Bottomley@HansenPartnership.com>
| > ---
| >  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
| 

James, how about to use x86_quirks->arch_intr_init() for this?
Wouldn't it be more convenient?

(I was trying to reproduce this bug -- so I fetched latest tip/master
 since there a lot of your fixes already should be

	commit dda51106620c328b50007c259b9ef8cea2b7c3d2
	Merge: 3391961... a376f30...
	Author: Ingo Molnar <mingo@elte.hu>
	Date:   Fri Oct 31 11:03:54 2008 +0100

	    Merge branch 'x86/cleanups'

but eventually I've got build-bug-storm and gave up :-)

		- Cyrill -

  parent reply	other threads:[~2008-10-31 17:36 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-10-30 21:04 James Bottomley
2008-10-30 22:06 ` Ingo Molnar
2008-10-31  5:28   ` Cyrill Gorcunov
2008-10-31  6:15     ` Cyrill Gorcunov
2008-10-31 17:46       ` James Bottomley
2008-10-31 17:30   ` Cyrill Gorcunov [this message]
2008-10-31 17:52   ` James Bottomley

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20081031173010.GA20803@localhost \
    --to=gorcunov@gmail.com \
    --cc=James.Bottomley@HansenPartnership.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=tglx@linutronix.de \
    --subject='Re: [PATCH] fix compile breakage caused by 2ae111cdd8d83ebf9de72e36e68a8c84b6ebbeea' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).