Date: Sat, 2 Feb 2008 16:39:47 -0800
From: Andrew Morton <akpm@linux-foundation.org>
To: Harvey Harrison <harvey.harrison@gmail.com>
Cc: Russell Leidich <rml@google.com>, Andi Kleen <andi@firstfloor.org>,
       Torsten Kaiser <just.for.lkml@googlemail.com>,
       linux-kernel@vger.kernel.org, Thomas Gleixner <tglx@linutronix.de>,
       Ingo Molnar <mingo@elte.hu>, valdis.kletnieks@vt.edu,
       Tim Hockin <thockin@google.com>
Subject: Re: [PATCH] AMD Thermal Interrupt Support
Message-Id: <20080202163947.c66f6d19.akpm@linux-foundation.org>
In-Reply-To: <1201998460.1844.32.camel@brick>
References: <3f1a065b0801021350x7fd065fbj9680ce1a4f3c6538@mail.gmail.com>
	<20080104222637.GA19248@one.firstfloor.org>
	<3f1a065b0801041653y77c27a8cvce703cb7d13e10a0@mail.gmail.com>
	<20080105132402.GA705@one.firstfloor.org>
	<3f1a065b0801051208y7e832e8ctda61f28e6328dec3@mail.gmail.com>
	<3f1a065b0801081542p6cca6249g35e83f7e1f450fbd@mail.gmail.com>
	<20080108235212.GE2117@one.firstfloor.org>
	<3f1a065b0801081828y4b084a52g1db9bcb8821cb3da@mail.gmail.com>
	<20080109023714.GK2117@one.firstfloor.org>
	<3f1a065b0801101821k71ea7523l5024f12abb50357f@mail.gmail.com>
	<3f1a065b0801171706o57ae5d6w8a986db508ddcee4@mail.gmail.com>
	<20080202161057.b240f443.akpm@linux-foundation.org>
	<1201998460.1844.32.camel@brick>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 2940
Lines: 60

On Sat, 02 Feb 2008 16:27:40 -0800 Harvey Harrison <harvey.harrison@gmail.com> wrote:

> On Sat, 2008-02-02 at 16:10 -0800, Andrew Morton wrote:
> > On Thu, 17 Jan 2008 17:06:33 -0800 "Russell Leidich" <rml@google.com> wrote:
> > 
> > > > Here's the hopefully-final version of the patch, which I have just
> > > > tested on Intel and AMD.
> > 
> > Curious.  This just broke.
> > 
> > i386 allmodconfig:
> > 
> > arch/x86/kernel/cpu/mcheck/p4.o: In function `smp_thermal_interrupt':
> > arch/x86/kernel/cpu/mcheck/p4.c:61: multiple definition of `smp_thermal_interrupt'
> > arch/x86/kernel/cpu/mcheck/mce_thermal.o:arch/x86/kernel/cpu/mcheck/mce_thermal.c:17: first defined here
> > /opt/crosstool/gcc-4.1.0-glibc-2.3.6/i686-unknown-linux-gnu/bin/i686-unknown-linux-gnu-ld: Warning: size of symbol `smp_thermal_interrupt' changed from 4 in arch/x86/kernel/cpu/mcheck/mce_thermal.o to 43 in arch/x86/kernel/cpu/mcheck/p4.o
> > /opt/crosstool/gcc-4.1.0-glibc-2.3.6/i686-unknown-linux-gnu/bin/i686-unknown-linux-gnu-ld: Warning: type of symbol `smp_thermal_interrupt' changed from 1 to 2 in arch/x86/kernel/cpu/mcheck/p4.o
> > 
> > In mainline we just did this:
> > 
> > --- linux-2.6.24/arch/x86/kernel/cpu/mcheck/p4.c        2008-02-01 14:29:18.000000000 -0800
> > +++ devel/arch/x86/kernel/cpu/mcheck/p4.c       2008-02-02 15:38:06.000000000 -0800
> > @@ -57,7 +57,7 @@ static void intel_thermal_interrupt(stru
> >  /* Thermal interrupt handler for this CPU setup */
> >  static void (*vendor_thermal_interrupt)(struct pt_regs *regs) = unexpected_thermal_interrupt;
> >  
> > -fastcall void smp_thermal_interrupt(struct pt_regs *regs)
> > +void smp_thermal_interrupt(struct pt_regs *regs)
> > 
> > which I think was always wrong and has just now tripped up the linker.  I
> > _assume_ that function should be __attribute__((weak)).  Then again, maybe
> > I'm full of it.  But hey, it compiles now.
> > 
> 
> What tree fails to compile?

Current mainline plus current -mm mess.  I don't think there's anything
else apart from this patch involved though.

> grepping mainline:
> 
> ./arch/x86/kernel/cpu/mcheck/mce_intel_64.c:asmlinkage void smp_thermal_interrupt(void)
> ./arch/x86/kernel/cpu/mcheck/p4.c:void smp_thermal_interrupt(struct pt_regs *regs)
> ./arch/x86/kernel/entry_64.S:   apicinterrupt THERMAL_APIC_VECTOR,smp_thermal_interrupt
> ./arch/x86/kernel/traps_64.c:asmlinkage void __attribute__((weak)) smp_thermal_interrupt(void)
> 
> Notice the one in p4.c doesn't take void args.

Yeah.  I didn't really look into what all this is supposed to do. 
Something seems a bit broken.

> I'll look into it.


Thanks.  My current queue is (as usual) at http://userweb.kernel.org/~akpm/mmotm/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/