Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 163038
b: refs/heads/master
c: 94699b0
h: refs/heads/master
v: v3
  • Loading branch information
Bartlomiej Zolnierkiewicz authored and H. Peter Anvin committed Jul 29, 2009
1 parent 32f1d8e commit 75f2207
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3ccdccfadbd2548abe38682b587f4ba27eac2fc9
refs/heads/master: 94699b04eddd4b247d871930431d6fa1a46c175e
4 changes: 4 additions & 0 deletions trunk/arch/x86/kernel/cpu/mcheck/mce.c
Original file line number Diff line number Diff line change
Expand Up @@ -1269,6 +1269,10 @@ static void mce_cpu_quirks(struct cpuinfo_x86 *c)
if ((c->x86 > 6 || (c->x86 == 6 && c->x86_model >= 0xe)) &&
monarch_timeout < 0)
monarch_timeout = USEC_PER_SEC;

/* There are also broken BIOSes on some Pentium M systems. */
if (c->x86 == 6 && c->x86_model == 13 && mce_bootlog < 0)
mce_bootlog = 0;
}
if (monarch_timeout < 0)
monarch_timeout = 0;
Expand Down

0 comments on commit 75f2207

Please sign in to comment.