Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751104Ab0LLF1H (ORCPT ); Sun, 12 Dec 2010 00:27:07 -0500 Received: from mail-wy0-f174.google.com ([74.125.82.174]:63764 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750806Ab0LLF1E convert rfc822-to-8bit (ORCPT ); Sun, 12 Dec 2010 00:27:04 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; b=XB+ysZDAV34pV0/VvdxVoQpzG00N3vCM2vDNmGy7DT3WRqAkpEH+diC3f4OpUVOoqg 25OtA8KR+WhBQ5l+NYzxotW/gR4op3ibSnOTJZoCSNuBY2cUhXNgASbxMpPMduxPKvn+ pcGMF+M/Vxe7wIKamYunaFAISa/hqms6mbFN0= MIME-Version: 1.0 In-Reply-To: <20101210092533.4f426650.randy.dunlap@oracle.com> References: <20101210135746.0cf6cbcd.sfr@canb.auug.org.au> <20101210092533.4f426650.randy.dunlap@oracle.com> Date: Sun, 12 Dec 2010 11:27:02 +0600 Message-ID: Subject: Re: linux-next: Tree for December 10 (x86 nmi_watchdog) From: Rakib Mullick To: Randy Dunlap Cc: Stephen Rothwell , linux-next@vger.kernel.org, LKML , Don Zickus , Ingo Molnar , Thomas Gleixner , x86@kernel.org Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1622 Lines: 49 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 > Hello Randy, Please checkout the following patch. Does it work? ---- x86: Fix kernel build in hw_nmi.c when CONFIG_HARDLOCKUP_DETECTOR=n. This patch fixes kernel build introduced by commit 96a84c20d635fb1e98ab92f9fc517c4441f5c424. That commit supposed to define touch_nmi_watchdog when CONFIG_HARDLOCKUP_DETECTOR=y in hw_nmi.c. But mistakenly defines touch_nmi_watchdog when CONFIG_HARDLOCKUP_DETECTOR=n in hw_nmi.c. arch/x86/kernel/apic/hw_nmi.c:28: error: redefinition of ?touch_nmi_watchdog? include/linux/nmi.h:23: error: previous definition of ?touch_nmi_watchdog? was here Signed-off-by: Rakib Mullick --- 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(); -- 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/