diff options
author | Jeremy Fitzhardinge <jeremy@goop.org> | 2008-09-07 05:37:32 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-09-07 11:40:02 -0400 |
commit | c885df50f571faf9fd9f395361cfff1b3a16e06e (patch) | |
tree | 4a6d416a60553cd9e569a6ef669a579c5f0748b7 /arch/x86/Kconfig | |
parent | 9f077871ce7237e2387fc76542b3b4033cb05e49 (diff) |
x86: default corruption check to off, but put parameter default in Kconfig
Default the low memory corruption check to off, but make the default setting of
the memory_corruption_check kernel parameter a config parameter.
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r-- | arch/x86/Kconfig | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index cbee4199689c..7820d447bb8d 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -1061,7 +1061,6 @@ config HIGHPTE | |||
1061 | 1061 | ||
1062 | config X86_CHECK_BIOS_CORRUPTION | 1062 | config X86_CHECK_BIOS_CORRUPTION |
1063 | bool "Check for low memory corruption" | 1063 | bool "Check for low memory corruption" |
1064 | default y | ||
1065 | help | 1064 | help |
1066 | Periodically check for memory corruption in low memory, which | 1065 | Periodically check for memory corruption in low memory, which |
1067 | is suspected to be caused by BIOS. Even when enabled in the | 1066 | is suspected to be caused by BIOS. Even when enabled in the |
@@ -1082,6 +1081,14 @@ config X86_CHECK_BIOS_CORRUPTION | |||
1082 | you can use memmap= to prevent the kernel from using that | 1081 | you can use memmap= to prevent the kernel from using that |
1083 | memory. | 1082 | memory. |
1084 | 1083 | ||
1084 | config X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK | ||
1085 | bool "Set the default setting of memory_corruption_check" | ||
1086 | depends on X86_CHECK_BIOS_CORRUPTION | ||
1087 | default y | ||
1088 | help | ||
1089 | Set whether the default state of memory_corruption_check is | ||
1090 | on or off. | ||
1091 | |||
1085 | config MATH_EMULATION | 1092 | config MATH_EMULATION |
1086 | bool | 1093 | bool |
1087 | prompt "Math emulation" if X86_32 | 1094 | prompt "Math emulation" if X86_32 |