[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <48C3A0DC.8000206@goop.org>
Date: Sun, 07 Sep 2008 02:37:32 -0700
From: Jeremy Fitzhardinge <jeremy@...p.org>
To: Ingo Molnar <mingo@...e.hu>
CC: linux-kernel@...r.kernel.org, Hugh Dickens <hugh@...itas.com>,
"H. Peter Anvin" <hpa@...or.com>,
Alan Jenkins <alan-jenkins@...fmail.co.uk>,
Rafa? Mi?ecki
<zajec5@...il.com>
Subject: [PATCH 4/3] 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@...rix.com>
---
arch/x86/Kconfig | 9 ++++++++-
arch/x86/kernel/setup.c | 13 ++++++++++++-
2 files changed, 20 insertions(+), 2 deletions(-)
===================================================================
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1139,7 +1139,6 @@
config X86_CHECK_BIOS_CORRUPTION
bool "Check for low memory corruption"
- default y
help
Periodically check for memory corruption in low memory, which
is suspected to be caused by BIOS. Even when enabled in the
@@ -1159,6 +1158,14 @@
BIOS-originated corruption always affects the same memory,
you can use memmap= to prevent the kernel from using that
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
bool
===================================================================
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -590,7 +590,8 @@
#ifdef CONFIG_X86_CHECK_BIOS_CORRUPTION
#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_period = 60; /* seconds */
@@ -636,6 +637,16 @@
static void __init setup_bios_corruption_check(void)
{
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)
memory_corruption_check = 0;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists