---

yaml --- r: 99897 b: refs/heads/master c: 2b6adda h: refs/heads/master i: 99895: 95325c5 v: v3
git-mirror · Jul 8, 2008 · 4d817c7 · 4d817c7
1 parent 00a5b0f
commit 4d817c7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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;