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>
This commit is contained in:
parent
9f077871ce
commit
c885df50f5
|
@ -1061,7 +1061,6 @@ config HIGHPTE
|
||||||
|
|
||||||
config X86_CHECK_BIOS_CORRUPTION
|
config X86_CHECK_BIOS_CORRUPTION
|
||||||
bool "Check for low memory corruption"
|
bool "Check for low memory corruption"
|
||||||
default y
|
|
||||||
help
|
help
|
||||||
Periodically check for memory corruption in low memory, which
|
Periodically check for memory corruption in low memory, which
|
||||||
is suspected to be caused by BIOS. Even when enabled in the
|
is suspected to be caused by BIOS. Even when enabled in the
|
||||||
|
@ -1082,6 +1081,14 @@ config X86_CHECK_BIOS_CORRUPTION
|
||||||
you can use memmap= to prevent the kernel from using that
|
you can use memmap= to prevent the kernel from using that
|
||||||
memory.
|
memory.
|
||||||
|
|
||||||
|
config X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK
|
||||||
|
bool "Set the default setting of memory_corruption_check"
|
||||||
|
depends on X86_CHECK_BIOS_CORRUPTION
|
||||||
|
default y
|
||||||
|
help
|
||||||
|
Set whether the default state of memory_corruption_check is
|
||||||
|
on or off.
|
||||||
|
|
||||||
config MATH_EMULATION
|
config MATH_EMULATION
|
||||||
bool
|
bool
|
||||||
prompt "Math emulation" if X86_32
|
prompt "Math emulation" if X86_32
|
||||||
|
|
|
@ -587,7 +587,8 @@ struct x86_quirks *x86_quirks __initdata = &default_x86_quirks;
|
||||||
#ifdef CONFIG_X86_CHECK_BIOS_CORRUPTION
|
#ifdef CONFIG_X86_CHECK_BIOS_CORRUPTION
|
||||||
#define MAX_SCAN_AREAS 8
|
#define MAX_SCAN_AREAS 8
|
||||||
|
|
||||||
static int __read_mostly memory_corruption_check = 0;
|
static int __read_mostly memory_corruption_check = -1;
|
||||||
|
|
||||||
static unsigned __read_mostly corruption_check_size = 64*1024;
|
static unsigned __read_mostly corruption_check_size = 64*1024;
|
||||||
static unsigned __read_mostly corruption_check_period = 60; /* seconds */
|
static unsigned __read_mostly corruption_check_period = 60; /* seconds */
|
||||||
|
|
||||||
|
@ -634,6 +635,16 @@ static void __init setup_bios_corruption_check(void)
|
||||||
{
|
{
|
||||||
u64 addr = PAGE_SIZE; /* assume first page is reserved anyway */
|
u64 addr = PAGE_SIZE; /* assume first page is reserved anyway */
|
||||||
|
|
||||||
|
if (memory_corruption_check == -1) {
|
||||||
|
memory_corruption_check =
|
||||||
|
#ifdef CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK
|
||||||
|
1
|
||||||
|
#else
|
||||||
|
0
|
||||||
|
#endif
|
||||||
|
;
|
||||||
|
}
|
||||||
|
|
||||||
if (corruption_check_size == 0)
|
if (corruption_check_size == 0)
|
||||||
memory_corruption_check = 0;
|
memory_corruption_check = 0;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue