[patch, -rc5-mm1] lock validator: fix NMI-disabling on x86_64

and NMI disabling wasnt perfect on x86_64 either. (we did it too late, 
which allowed a few NMI ticks to still occur.)

---------------
Subject: lock validator: fix NMI-disabling on x86_64
From: Ingo Molnar <[email protected]>

this does the NMI-watchdog disabling at the right place on x86_64.

should probably be folded into:
   
   lock-validator-disable-nmi-watchdog-if-config_lockdep.patch

Signed-off-by: Ingo Molnar <[email protected]>
---
 arch/x86_64/kernel/nmi.c |   23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

Index: linux/arch/x86_64/kernel/nmi.c
===================================================================
--- linux.orig/arch/x86_64/kernel/nmi.c
+++ linux/arch/x86_64/kernel/nmi.c
@@ -215,18 +215,6 @@ int __init check_nmi_watchdog (void)
 	int *counts;
 	int cpu;
 
-#ifdef CONFIG_LOCKDEP
-	/*
-	 * The NMI watchdog uses spinlocks (notifier chains, etc.),
-	 * so it's not lockdep-safe:
-	 */
-	nmi_watchdog = 0;
-	for_each_online_cpu(cpu)
-		per_cpu(nmi_watchdog_ctlblk.enabled, cpu) = 0;
-
-	printk("lockdep: disabled NMI watchdog.\n");
-	return 0;
-#endif
 	if ((nmi_watchdog == NMI_NONE) || (nmi_watchdog == NMI_DEFAULT))
 		return 0;
 
@@ -680,6 +668,17 @@ static void stop_intel_arch_watchdog(voi
 
 void setup_apic_nmi_watchdog(void *unused)
 {
+#ifdef CONFIG_LOCKDEP
+	/*
+	 * The NMI watchdog uses spinlocks (notifier chains, etc.),
+	 * so it's not lockdep-safe:
+	 */
+	nmi_watchdog = NMI_NONE;
+	printk("lockdep: disabled NMI watchdog.\n");
+
+	return;
+#endif
+
 	/* only support LOCAL and IO APICs for now */
 	if ((nmi_watchdog != NMI_LOCAL_APIC) &&
 	    (nmi_watchdog != NMI_IO_APIC))
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

---

• References:
  • 2.6.17-rc5-mm1
    • From: Andrew Morton <[email protected]>
  • [patch, -rc5-mm1] lock validator, fix NULL type->name bug
    • From: Ingo Molnar <[email protected]>
  • Re: [patch, -rc5-mm1] lock validator, fix NULL type->name bug
    • From: Mike Galbraith <[email protected]>
  • Re: [patch, -rc5-mm1] lock validator, fix NULL type->name bug
    • From: Mike Galbraith <[email protected]>
  • Re: [patch, -rc5-mm1] lock validator, fix NULL type->name bug
    • From: Ingo Molnar <[email protected]>
  • Re: [patch, -rc5-mm1] lock validator, fix NULL type->name bug
    • From: Mike Galbraith <[email protected]>
  • Re: [patch, -rc5-mm1] lock validator, fix NULL type->name bug
    • From: Ingo Molnar <[email protected]>
  • Re: [patch, -rc5-mm1] lock validator, fix NULL type->name bug
    • From: Mike Galbraith <[email protected]>
  • [patch, -rc5-mm1] lock validator: disable NMI watchdog if CONFIG_LOCKDEP, i386
    • From: Ingo Molnar <[email protected]>

• Prev by Date: Re: IO APIC IRQ assignment
• Next by Date: Re: 2.6.17-rc4-mm3 cfq oops->panic w. fs damage
• Previous by thread: [patch, -rc5-mm1] lock validator: disable NMI watchdog if CONFIG_LOCKDEP, i386
• Next by thread: Re: [patch, -rc5-mm1] lock validator: disable NMI watchdog if CONFIG_LOCKDEP, i386
• Index(es):
  • Date
  • Thread

[Index of Archives]     [Kernel Newbies]     [Netfilter]     [Bugtraq]     [Photo]     [Stuff]     [Gimp]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Video 4 Linux]     [Linux for the blind]     [Linux Resources]