From: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>
Date: Mon, 19 May 2008 21:23:44 +0000 (-0700)
Subject: x86: remove duplicate declaration of unknown_nmi_panic
X-Git-Tag: v2.6.27-rc1~1106^2~245^2~22
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=2e4db9d2c5db9c9dd3e1d1ec3263bc4a990ff8df;p=~andy%2Flinux

x86: remove duplicate declaration of unknown_nmi_panic

Signed-off-by: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---

diff --git a/include/asm-x86/nmi.h b/include/asm-x86/nmi.h
index 1e363021e72..8455bf36d8d 100644
--- a/include/asm-x86/nmi.h
+++ b/include/asm-x86/nmi.h
@@ -46,7 +46,6 @@ extern void nmi_watchdog_default(void);
 
 extern int check_nmi_watchdog(void);
 extern int nmi_watchdog_enabled;
-extern int unknown_nmi_panic;
 extern int avail_to_resrv_perfctr_nmi_bit(unsigned int);
 extern int avail_to_resrv_perfctr_nmi(unsigned int);
 extern int reserve_perfctr_nmi(unsigned int);