Re: linux-next: Tree for December 21 (nmi watchdog)

[Don Zickus]

On Tue, Dec 21, 2010 at 09:10:47AM -0800, Randy Dunlap wrote:
> On Tue, 21 Dec 2010 19:05:26 +1100 Stephen Rothwell wrote:
> 
> > Hi all,
> > 
> > [The mirroring on kernel.org is running slowly]
> > 
> > Changes since 20101220:
> 
> 
> kernel/built-in.o: In function `watchdog_nmi_enable':
> watchdog.c:(.text+0x58539): undefined reference to `hw_nmi_get_sample_period'
> 
> 
> kernel config file is attached.

I have a bigger clean up patch that I sent to Ingo that fixes this
correctly.  But for now, you can use this patch.

Cheers,
Don


diff --git a/arch/x86/kernel/apic/hw_nmi.c b/arch/x86/kernel/apic/hw_nmi.c
index 93da91d..a4fa849 100644
--- a/arch/x86/kernel/apic/hw_nmi.c
+++ b/arch/x86/kernel/apic/hw_nmi.c
@@ -17,7 +17,6 @@
 #include <linux/nmi.h>
 #include <linux/module.h>
 
-#ifdef ARCH_HAS_NMI_WATCHDOG
 #ifdef CONFIG_HARDLOCKUP_DETECTOR
 u64 hw_nmi_get_sample_period(void)
 {
@@ -25,6 +24,7 @@ u64 hw_nmi_get_sample_period(void)
 }
 #endif
 
+#ifdef ARCH_HAS_NMI_WATCHDOG
 #ifndef CONFIG_HARDLOCKUP_DETECTOR
 void touch_nmi_watchdog(void)
 {
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/