From 39ff707f7f926ac32f6dde59955c65bde8e2f04b Mon Sep 17 00:00:00 2001 From: "mingo@elte.hu" Date: Thu, 5 Jun 2008 11:18:12 +0200 Subject: [PATCH] --- yaml --- r: 99819 b: refs/heads/master c: 75b9f5d2a0318da9d5e694a9a1be33f46b4c021e h: refs/heads/master i: 99817: 978896489c000e8d6e5466a0bf87999bd931618c 99815: e17aa15effab7a59264049ba340460637c1e9325 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/nmi.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a850a71acc82..0dad576b22ba 100644 --- 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 index 27ca8f69b466..19f1b95265cf 100644 --- a/trunk/arch/x86/kernel/nmi.c +++ b/trunk/arch/x86/kernel/nmi.c @@ -88,7 +88,6 @@ 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) { @@ -96,7 +95,6 @@ void nmi_watchdog_default(void) return; nmi_watchdog = NMI_NONE; } -#endif #ifdef CONFIG_SMP /*