From mboxrd@z Thu Jan 1 00:00:00 1970 From: Don Zickus Subject: Re: linux-next: Tree for December 10 (x86 nmi_watchdog) Date: Mon, 13 Dec 2010 09:44:34 -0500 Message-ID: <20101213144434.GB18577@redhat.com> References: <20101210135746.0cf6cbcd.sfr@canb.auug.org.au> <20101210092533.4f426650.randy.dunlap@oracle.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mx1.redhat.com ([209.132.183.28]:40245 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753280Ab0LMOpH (ORCPT ); Mon, 13 Dec 2010 09:45:07 -0500 Content-Disposition: inline In-Reply-To: Sender: linux-next-owner@vger.kernel.org List-ID: To: Rakib Mullick Cc: Randy Dunlap , Stephen Rothwell , linux-next@vger.kernel.org, LKML , Ingo Molnar , Thomas Gleixner , x86@kernel.org On Sun, Dec 12, 2010 at 11:27:02AM +0600, Rakib Mullick wrote: > On Fri, Dec 10, 2010 at 11:25 PM, Randy Dunlap wrote: > > On Fri, 10 Dec 2010 13:57:46 +1100 Stephen Rothwell wrote: > > > >> Hi all, > >> > >> Changes since 20101209: > > > > > > arch/x86/kernel/apic/hw_nmi.c:28: error: redefinition of 'touch_nmi_watchdog' > > include/linux/nmi.h:22: note: previous definition of 'touch_nmi_watchdog' was here I'll have to checkout that branch to see what got merged. I thought I fixed all these. Is there a config I can use to duplicate these? > diff --git a/arch/x86/kernel/apic/hw_nmi.c b/arch/x86/kernel/apic/hw_nmi.c > index c558e11..2056569 100644 > --- a/arch/x86/kernel/apic/hw_nmi.c > +++ b/arch/x86/kernel/apic/hw_nmi.c > @@ -24,7 +24,7 @@ u64 hw_nmi_get_sample_period(void) > } > #endif > > -#ifndef CONFIG_HARDLOCKUP_DETECTOR > +#ifdef CONFIG_HARDLOCKUP_DETECTOR > void touch_nmi_watchdog(void) > { > touch_softlockup_watchdog(); NAK. This isn't the right patch. This chunk is in here because of changes to nmi.h. Something broke in that file. Cheers, Don