diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-02-25 09:00:38 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-02-25 09:00:38 +0100 |
| commit | c0853867a10f9215132dccdb84c720a5f856f4d2 (patch) | |
| tree | 92d3162ea2fc6fe0276dabc869e01293325f862c /Documentation | |
| parent | 6dc390ad61ac8dfca5fa9b0823981fb6f7ec17a0 (diff) | |
| parent | 1923f3d02768bd904dfe5607f3f93c3008b8db61 (diff) | |
| download | linux-c0853867a10f9215132dccdb84c720a5f856f4d2.tar.gz linux-c0853867a10f9215132dccdb84c720a5f856f4d2.tar.bz2 linux-c0853867a10f9215132dccdb84c720a5f856f4d2.zip | |
Merge branch 'x86/debug' into core/objtool, to pick up frame pointer fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 2 | ||||
| -rw-r--r-- | Documentation/x86/x86_64/boot-options.txt | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 9a53c929f017..0d27a9adabf8 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -666,7 +666,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. clearcpuid=BITNUM [X86] Disable CPUID feature X for the kernel. See - arch/x86/include/asm/cpufeature.h for the valid bit + arch/x86/include/asm/cpufeatures.h for the valid bit numbers. Note the Linux specific bits are not necessarily stable over kernel options, but the vendor specific ones should be. diff --git a/Documentation/x86/x86_64/boot-options.txt b/Documentation/x86/x86_64/boot-options.txt index 68ed3114c363..0965a71f9942 100644 --- a/Documentation/x86/x86_64/boot-options.txt +++ b/Documentation/x86/x86_64/boot-options.txt @@ -60,6 +60,8 @@ Machine check threshold to 1. Enabling this may make memory predictive failure analysis less effective if the bios sets thresholds for memory errors since we will not see details for all errors. + mce=recovery + Force-enable recoverable machine check code paths nomce (for compatibility with i386): same as mce=off |