From d217ff05fa66426ee96b9f9dde26edef5082e8c7 Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Wed, 27 May 2009 21:56:56 +0200 Subject: [PATCH] --- yaml --- r: 148901 b: refs/heads/master c: 8780e8e0f6b34862cdf2c62d4d2674d6bc3207db h: refs/heads/master i: 148899: c66768f58777f6f7fa09e959ac7d99ae56fda5de v: v3 --- [refs] | 2 +- trunk/Documentation/x86/x86_64/boot-options.txt | 2 ++ trunk/Documentation/x86/x86_64/machinecheck | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7ba19f66a646..110f7a467660 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b170204ddb7844ffff62d2d537b20c0eeb97725e +refs/heads/master: 8780e8e0f6b34862cdf2c62d4d2674d6bc3207db diff --git a/trunk/Documentation/x86/x86_64/boot-options.txt b/trunk/Documentation/x86/x86_64/boot-options.txt index 34c13040a718..63fca718256e 100644 --- a/trunk/Documentation/x86/x86_64/boot-options.txt +++ b/trunk/Documentation/x86/x86_64/boot-options.txt @@ -5,6 +5,8 @@ only the AMD64 specific ones are listed here. Machine check + Please see Documentation/x86/x86_64/machinecheck for sysfs runtime tunables. + mce=off disable machine check mce=bootlog Enable logging of machine checks left over from booting. Disabled by default on AMD because some BIOS leave bogus ones. diff --git a/trunk/Documentation/x86/x86_64/machinecheck b/trunk/Documentation/x86/x86_64/machinecheck index a05e58e7b159..a4fdb25446e0 100644 --- a/trunk/Documentation/x86/x86_64/machinecheck +++ b/trunk/Documentation/x86/x86_64/machinecheck @@ -41,7 +41,9 @@ check_interval the polling interval. When the poller stops finding MCEs, it triggers an exponential backoff (poll less often) on the polling interval. The check_interval variable is both the initial and - maximum polling interval. + maximum polling interval. 0 means no polling for corrected machine + check errors (but some corrected errors might be still reported + in other ways) tolerant Tolerance level. When a machine check exception occurs for a non