From mboxrd@z Thu Jan 1 00:00:00 1970 From: Don Zickus Subject: Re: linux-next: build failure after merge of the final tree Date: Fri, 14 May 2010 11:03:43 -0400 Message-ID: <20100514150343.GQ15159@redhat.com> References: <20100514155312.9684cb9d.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mx1.redhat.com ([209.132.183.28]:40894 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751140Ab0ENPVb (ORCPT ); Fri, 14 May 2010 11:21:31 -0400 Content-Disposition: inline In-Reply-To: <20100514155312.9684cb9d.sfr@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, David Miller On Fri, May 14, 2010 at 03:53:12PM +1000, Stephen Rothwell wrote: > Hi all, > > After merging the final tree, today's linux-next build (sparc64 defconfig) > failed like this: > > kernel/built-in.o: In function `touch_nmi_watchdog': > (.text+0x449bc): multiple definition of `touch_nmi_watchdog' > arch/sparc/kernel/built-in.o:(.text+0x11b28): first defined here > > Probably caused by commit 58687acba59266735adb8ccd9b5b9aa2c7cd205b > ("lockup_detector: Combine nmi_watchdog and softlockup detector"). > > The one in kernel/ used to only be built when CONFIG_NMI_WATCHDOG was set > which depended on CONFIG_PERF_EVENTS_NMI which was only ever set for > ARCH=x86. This probably breaks mn10300 and blackfin as well, at least. > We also have ARCH_HAS_NMI_WATCHDOG to determine this ... > > I tried protecting the definition of touch_nmi_watchdog with > ARCH_HAS_NMI_WATCHDOG, but that broke the x86_64 allmodconfig build > (which defines ARCH_HAS_NMI_WATCHDOG if CONFIG_X86_LOCAL_APIC is defined > but only builds its version if CONFIG_LOCKUP_DETECTOR is not 'y'). > > So I have left is as it is for today. Please see if someone can come up > with a solution. Sorry for the mess. I think the following patch cleans it up. The last piece deals with the sparc mess, the other two pieces should deal with the x86 fallout. Cheers, Don diff --git a/arch/x86/kernel/apic/Makefile b/arch/x86/kernel/apic/Makefile index 52f32e0..3a57a04 100644 --- a/arch/x86/kernel/apic/Makefile +++ b/arch/x86/kernel/apic/Makefile @@ -3,10 +3,10 @@ # obj-$(CONFIG_X86_LOCAL_APIC) += apic.o apic_noop.o probe_$(BITS).o ipi.o -ifneq ($(CONFIG_LOCKUP_DETECTOR),y) +ifneq ($(CONFIG_PERF_EVENTS_NMI),y) obj-$(CONFIG_X86_LOCAL_APIC) += nmi.o endif -obj-$(CONFIG_LOCKUP_DETECTOR) += hw_nmi.o +obj-$(CONFIG_PERF_EVENTS_NMI) += hw_nmi.o obj-$(CONFIG_X86_IO_APIC) += io_apic.o obj-$(CONFIG_SMP) += ipi.o diff --git a/include/linux/nmi.h b/include/linux/nmi.h index abd48aa..9a30da4 100644 --- a/include/linux/nmi.h +++ b/include/linux/nmi.h @@ -20,7 +20,7 @@ extern void touch_nmi_watchdog(void); extern void acpi_nmi_disable(void); extern void acpi_nmi_enable(void); #else -#ifndef CONFIG_LOCKUP_DETECTOR +#ifndef CONFIG_PERF_EVENTS_NMI static inline void touch_nmi_watchdog(void) { touch_softlockup_watchdog(); diff --git a/kernel/watchdog.c b/kernel/watchdog.c index be5e74e..61b63ca 100644 --- a/kernel/watchdog.c +++ b/kernel/watchdog.c @@ -139,12 +139,14 @@ void touch_all_softlockup_watchdogs(void) per_cpu(watchdog_touch_ts, cpu) = 0; } +#ifdef CONFIG_PERF_EVENTS_NMI void touch_nmi_watchdog(void) { __get_cpu_var(watchdog_nmi_touch) = true; touch_softlockup_watchdog(); } EXPORT_SYMBOL(touch_nmi_watchdog); +#endif void touch_softlockup_watchdog_sync(void) {