From 4d817c75b6bbf4696c2b217e6b42860c9d978545 Mon Sep 17 00:00:00 2001
From: Cyrill Gorcunov <gorcunov@gmail.com>
Date: Tue, 24 Jun 2008 22:52:04 +0200
Subject: [PATCH] --- yaml --- r: 99897 b: refs/heads/master c:
 2b6addad2d67a2d75ae10a1c8efd18d81d78ff82 h: refs/heads/master i:   99895:
 95325c55b7c11f149c44a2fda5cca552802774a8 v: v3

---
 [refs]                      | 2 +-
 trunk/arch/x86/kernel/nmi.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 72a23daf5f08..63162047004d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 116f570e5d8347bee2614da2361eeadbb639ea50
+refs/heads/master: 2b6addad2d67a2d75ae10a1c8efd18d81d78ff82
diff --git a/trunk/arch/x86/kernel/nmi.c b/trunk/arch/x86/kernel/nmi.c
index 9ebf71323c9a..427c511e7adc 100644
--- a/trunk/arch/x86/kernel/nmi.c
+++ b/trunk/arch/x86/kernel/nmi.c
@@ -187,7 +187,7 @@ int __init check_nmi_watchdog(void)
 
 static int __init setup_nmi_watchdog(char *str)
 {
-	int nmi;
+	unsigned int nmi;
 
 	if (!strncmp(str, "panic", 5)) {
 		panic_on_timeout = 1;
@@ -199,7 +199,7 @@ static int __init setup_nmi_watchdog(char *str)
 
 	get_option(&str, &nmi);
 
-	if (nmi >= NMI_INVALID || nmi < NMI_NONE)
+	if (nmi >= NMI_INVALID)
 		return 0;
 
 	nmi_watchdog = nmi;