---

yaml --- r: 99819 b: refs/heads/master c: 75b9f5d h: refs/heads/master i: 99817: 9788964 99815: e17aa15 v: v3
git-mirror · Jun 5, 2008 · 39ff707 · 39ff707
1 parent dbd2c0f
commit 39ff707
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1a1b1d1322ebd1ece405f3057cdd408bc77e391d
+refs/heads/master: 75b9f5d2a0318da9d5e694a9a1be33f46b4c021e
diff --git a/trunk/arch/x86/kernel/nmi.c b/trunk/arch/x86/kernel/nmi.c
@@ -88,15 +88,13 @@ static inline unsigned int get_timer_irqs(int cpu)
 #endif
 }
 
-#ifdef CONFIG_X86_64
 /* Run after command line and cpu_init init, but before all other checks */
 void nmi_watchdog_default(void)
 {
 	if (nmi_watchdog != NMI_DEFAULT)
 		return;
 	nmi_watchdog = NMI_NONE;
 }
-#endif
 
 #ifdef CONFIG_SMP
 /*