aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/kernel/cpu/mcheck/mce.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
index 07139a0578e3..7bd19c7f5315 100644
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@ -1269,6 +1269,10 @@ static void mce_cpu_quirks(struct cpuinfo_x86 *c)
1269 if ((c->x86 > 6 || (c->x86 == 6 && c->x86_model >= 0xe)) && 1269 if ((c->x86 > 6 || (c->x86 == 6 && c->x86_model >= 0xe)) &&
1270 monarch_timeout < 0) 1270 monarch_timeout < 0)
1271 monarch_timeout = USEC_PER_SEC; 1271 monarch_timeout = USEC_PER_SEC;
1272
1273 /* There are also broken BIOSes on some Pentium M systems. */
1274 if (c->x86 == 6 && c->x86_model == 13 && mce_bootlog < 0)
1275 mce_bootlog = 0;
1272 } 1276 }
1273 if (monarch_timeout < 0) 1277 if (monarch_timeout < 0)
1274 monarch_timeout = 0; 1278 monarch_timeout = 0;