LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Ingo Molnar <mingo@elte.hu>
To: James Bottomley <James.Bottomley@HansenPartnership.com>
Cc: linux-kernel <linux-kernel@vger.kernel.org>,
	Yinghai Lu <yinghai@kernel.org>,
	Thomas Gleixner <tglx@linutronix.de>,
	"H. Peter Anvin" <hpa@zytor.com>
Subject: Re: [VOYAGER] fix smp_intr_init() compile breakage
Date: Mon, 3 Nov 2008 10:53:23 +0100	[thread overview]
Message-ID: <20081103095323.GB13671@elte.hu> (raw)
In-Reply-To: <1225475989.3264.19.camel@localhost.localdomain>


* James Bottomley <James.Bottomley@HansenPartnership.com> wrote:

> On Thu, 2008-10-30 at 23:03 +0100, Ingo Molnar wrote:
> > * James Bottomley <James.Bottomley@HansenPartnership.com> wrote:
> > 
> > > >From 4d4d1ebea1e30d0ea51784139f18aa15acbff5d9 Mon Sep 17 00:00:00 2001
> > > From: James Bottomley <James.Bottomley@HansenPartnership.com>
> > > Date: Wed, 29 Oct 2008 11:13:33 -0500
> > > Subject: [VOYAGER] x86: fix smp_intr_init() compile breakage
> > > 
> > > Looks like this became static on the rest of x86.  Fix it up by adding
> > > an external definition to mach-voyager/setup.c
> > > 
> > > Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
> > > ---
> > >  arch/x86/mach-voyager/setup.c |    2 +-
> > >  1 files changed, 1 insertions(+), 1 deletions(-)
> > > 
> > > diff --git a/arch/x86/mach-voyager/setup.c b/arch/x86/mach-voyager/setup.c
> > > index 6bbdd63..7c6ff1a 100644
> > > --- a/arch/x86/mach-voyager/setup.c
> > > +++ b/arch/x86/mach-voyager/setup.c
> > > @@ -24,6 +24,7 @@ static struct irqaction irq2 = {
> > >  	.name = "cascade",
> > >  };
> > >  
> > > +extern void smp_intr_init(void);
> > >  void __init intr_init_hook(void)
> > 
> > please add function prototypes to the proper .h file. 
> > (arch/x86/include/asm/voyager.h in this case)
> > 
> > I'd also suggest to rename the function to voyager_smp_intr_init(). 
> > 
> > Note that Voyager already has a voyager_smp_intr_init() prototype in 
> > voyager.h. Something like the (completely untested) patch below.
> > 
> > 	Ingo
> > 
> > ---
> >  arch/x86/mach-voyager/setup.c       |    2 +-
> >  arch/x86/mach-voyager/voyager_smp.c |    2 +-
> >  2 files changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/arch/x86/mach-voyager/setup.c b/arch/x86/mach-voyager/setup.c
> > index 6bbdd63..a580b95 100644
> > --- a/arch/x86/mach-voyager/setup.c
> > +++ b/arch/x86/mach-voyager/setup.c
> > @@ -27,7 +27,7 @@ static struct irqaction irq2 = {
> >  void __init intr_init_hook(void)
> >  {
> >  #ifdef CONFIG_SMP
> > -	smp_intr_init();
> > +	voyager_smp_intr_init();
> >  #endif
> >  
> >  	setup_irq(2, &irq2);
> > diff --git a/arch/x86/mach-voyager/voyager_smp.c b/arch/x86/mach-voyager/voyager_smp.c
> > index ff2b2ed..95c9035 100644
> > --- a/arch/x86/mach-voyager/voyager_smp.c
> > +++ b/arch/x86/mach-voyager/voyager_smp.c
> > @@ -1250,7 +1250,7 @@ static void handle_vic_irq(unsigned int irq, struct irq_desc *desc)
> >  #define QIC_SET_GATE(cpi, vector) \
> >  	set_intr_gate((cpi) + QIC_DEFAULT_CPI_BASE, (vector))
> >  
> > -void __init smp_intr_init(void)
> > +void __init voyager_smp_intr_init(void)
> >  {
> >  	int i;
> 
> Not quite: still get the undeclared function in setup.c.  However, 
> this should work (also untested: I'm in flight at the moment).

applied to tip/x86/urgent, thanks James!

	Ingo

      reply	other threads:[~2008-11-03  9:53 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-10-30 21:02 James Bottomley
2008-10-30 22:03 ` Ingo Molnar
2008-10-31 17:59   ` James Bottomley
2008-11-03  9:53     ` Ingo Molnar [this message]

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=20081103095323.GB13671@elte.hu \
    --to=mingo@elte.hu \
    --cc=James.Bottomley@HansenPartnership.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=tglx@linutronix.de \
    --cc=yinghai@kernel.org \
    --subject='Re: [VOYAGER] fix smp_intr_init() compile breakage' \
    /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).