Re: linux-next: Tree for December 10 (x86 nmi_watchdog)

[Rakib Mullick]

On Fri, Dec 10, 2010 at 11:25 PM, Randy Dunlap <randy.dunlap@xxxxxxxxxx> 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 <rakib.mullick@xxxxxxxxx>
---

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@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/