diff options
Diffstat (limited to 'Documentation/x86_64')
| -rw-r--r-- | Documentation/x86_64/boot-options.txt | 8 | ||||
| -rw-r--r-- | Documentation/x86_64/machinecheck | 14 |
2 files changed, 13 insertions, 9 deletions
diff --git a/Documentation/x86_64/boot-options.txt b/Documentation/x86_64/boot-options.txt index a4595b22e092..945311840a10 100644 --- a/Documentation/x86_64/boot-options.txt +++ b/Documentation/x86_64/boot-options.txt | |||
| @@ -14,9 +14,11 @@ Machine check | |||
| 14 | mce=nobootlog | 14 | mce=nobootlog |
| 15 | Disable boot machine check logging. | 15 | Disable boot machine check logging. |
| 16 | mce=tolerancelevel (number) | 16 | mce=tolerancelevel (number) |
| 17 | 0: always panic, 1: panic if deadlock possible, | 17 | 0: always panic on uncorrected errors, log corrected errors |
| 18 | 2: try to avoid panic, 3: never panic or exit (for testing) | 18 | 1: panic or SIGBUS on uncorrected errors, log corrected errors |
| 19 | default is 1 | 19 | 2: SIGBUS or log uncorrected errors, log corrected errors |
| 20 | 3: never panic or SIGBUS, log all errors (for testing only) | ||
| 21 | Default is 1 | ||
| 20 | Can be also set using sysfs which is preferable. | 22 | Can be also set using sysfs which is preferable. |
| 21 | 23 | ||
| 22 | nomce (for compatibility with i386): same as mce=off | 24 | nomce (for compatibility with i386): same as mce=off |
diff --git a/Documentation/x86_64/machinecheck b/Documentation/x86_64/machinecheck index feaeaf6f6e4d..a05e58e7b159 100644 --- a/Documentation/x86_64/machinecheck +++ b/Documentation/x86_64/machinecheck | |||
| @@ -49,12 +49,14 @@ tolerant | |||
| 49 | Since machine check exceptions can happen any time it is sometimes | 49 | Since machine check exceptions can happen any time it is sometimes |
| 50 | risky for the kernel to kill a process because it defies | 50 | risky for the kernel to kill a process because it defies |
| 51 | normal kernel locking rules. The tolerance level configures | 51 | normal kernel locking rules. The tolerance level configures |
| 52 | how hard the kernel tries to recover even at some risk of deadlock. | 52 | how hard the kernel tries to recover even at some risk of |
| 53 | 53 | deadlock. Higher tolerant values trade potentially better uptime | |
| 54 | 0: always panic, | 54 | with the risk of a crash or even corruption (for tolerant >= 3). |
| 55 | 1: panic if deadlock possible, | 55 | |
| 56 | 2: try to avoid panic, | 56 | 0: always panic on uncorrected errors, log corrected errors |
| 57 | 3: never panic or exit (for testing only) | 57 | 1: panic or SIGBUS on uncorrected errors, log corrected errors |
| 58 | 2: SIGBUS or log uncorrected errors, log corrected errors | ||
| 59 | 3: never panic or SIGBUS, log all errors (for testing only) | ||
| 58 | 60 | ||
| 59 | Default: 1 | 61 | Default: 1 |
| 60 | 62 | ||