diff options
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r-- | arch/x86/Kconfig | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 1bb52e2ca02e..cbee4199689c 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -201,9 +201,6 @@ config X86_TRAMPOLINE | |||
201 | depends on X86_SMP || (X86_VOYAGER && SMP) || (64BIT && ACPI_SLEEP) | 201 | depends on X86_SMP || (X86_VOYAGER && SMP) || (64BIT && ACPI_SLEEP) |
202 | default y | 202 | default y |
203 | 203 | ||
204 | config X86_CHECK_BIOS_CORRUPTION | ||
205 | def_bool y | ||
206 | |||
207 | config KTIME_SCALAR | 204 | config KTIME_SCALAR |
208 | def_bool X86_32 | 205 | def_bool X86_32 |
209 | source "init/Kconfig" | 206 | source "init/Kconfig" |
@@ -1062,6 +1059,29 @@ config HIGHPTE | |||
1062 | low memory. Setting this option will put user-space page table | 1059 | low memory. Setting this option will put user-space page table |
1063 | entries in high memory. | 1060 | entries in high memory. |
1064 | 1061 | ||
1062 | config X86_CHECK_BIOS_CORRUPTION | ||
1063 | bool "Check for low memory corruption" | ||
1064 | default y | ||
1065 | help | ||
1066 | Periodically check for memory corruption in low memory, which | ||
1067 | is suspected to be caused by BIOS. Even when enabled in the | ||
1068 | configuration, it is disabled at runtime. Enable it by | ||
1069 | setting "memory_corruption_check=1" on the kernel command | ||
1070 | line. By default it scans the low 64k of memory every 60 | ||
1071 | seconds; see the memory_corruption_check_size and | ||
1072 | memory_corruption_check_period parameters in | ||
1073 | Documentation/kernel-parameters.txt to adjust this. | ||
1074 | |||
1075 | When enabled with the default parameters, this option has | ||
1076 | almost no overhead, as it reserves a relatively small amount | ||
1077 | of memory and scans it infrequently. It both detects corruption | ||
1078 | and prevents it from affecting the running system. | ||
1079 | |||
1080 | It is, however, intended as a diagnostic tool; if repeatable | ||
1081 | BIOS-originated corruption always affects the same memory, | ||
1082 | you can use memmap= to prevent the kernel from using that | ||
1083 | memory. | ||
1084 | |||
1065 | config MATH_EMULATION | 1085 | config MATH_EMULATION |
1066 | bool | 1086 | bool |
1067 | prompt "Math emulation" if X86_32 | 1087 | prompt "Math emulation" if X86_32 |