aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/nmi.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/kernel/nmi.c')
-rw-r--r--arch/x86/kernel/nmi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
index 9ebf71323c9..427c511e7ad 100644
--- a/arch/x86/kernel/nmi.c
+++ b/arch/x86/kernel/nmi.c
@@ -187,7 +187,7 @@ error:
187 187
188static int __init setup_nmi_watchdog(char *str) 188static int __init setup_nmi_watchdog(char *str)
189{ 189{
190 int nmi; 190 unsigned int nmi;
191 191
192 if (!strncmp(str, "panic", 5)) { 192 if (!strncmp(str, "panic", 5)) {
193 panic_on_timeout = 1; 193 panic_on_timeout = 1;
@@ -199,7 +199,7 @@ static int __init setup_nmi_watchdog(char *str)
199 199
200 get_option(&str, &nmi); 200 get_option(&str, &nmi);
201 201
202 if (nmi >= NMI_INVALID || nmi < NMI_NONE) 202 if (nmi >= NMI_INVALID)
203 return 0; 203 return 0;
204 204
205 nmi_watchdog = nmi; 205 nmi_watchdog = nmi;