summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile1
-rw-r--r--Makefile.release1
-rw-r--r--config-debug1
-rw-r--r--config-nodebug1
-rw-r--r--config-x86-generic2
-rw-r--r--kernel.spec4
6 files changed, 9 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index b73faf4c9..ce580e4a2 100644
--- a/Makefile
+++ b/Makefile
@@ -92,6 +92,7 @@ debug:
@perl -pi -e 's/# CONFIG_TEST_LIST_SORT is not set/CONFIG_TEST_LIST_SORT=y/' config-nodebug
@perl -pi -e 's/# CONFIG_DEBUG_ATOMIC_SLEEP is not set/CONFIG_DEBUG_ATOMIC_SLEEP=y/' config-nodebug
@perl -pi -e 's/# CONFIG_DETECT_HUNG_TASK is not set/CONFIG_DETECT_HUNG_TASK=y/' config-nodebug
+ @perl -pi -e 's/# CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set/CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y/' config-nodebug
@# just in case we're going from extremedebug -> debug
@perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-nodebug
diff --git a/Makefile.release b/Makefile.release
index c3f429bd9..c718c36ff 100644
--- a/Makefile.release
+++ b/Makefile.release
@@ -67,6 +67,7 @@ config-release:
@perl -pi -e 's/CONFIG_TEST_LIST_SORT=y/# CONFIG_TEST_LIST_SORT is not set/' config-nodebug
@perl -pi -e 's/CONFIG_DEBUG_ATOMIC_SLEEP=y/# CONFIG_DEBUG_ATOMIC_SLEEP is not set/' config-nodebug
@perl -pi -e 's/CONFIG_DETECT_HUNG_TASK=y/# CONFIG_DETECT_HUNG_TASK is not set/' config-nodebug
+ @perl -pi -e 's/CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y/# CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set/' config-nodebug
@perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-debug
@perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-nodebug
diff --git a/config-debug b/config-debug
index c6815cd51..19ae4656f 100644
--- a/config-debug
+++ b/config-debug
@@ -103,3 +103,4 @@ CONFIG_DETECT_HUNG_TASK=y
CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
diff --git a/config-nodebug b/config-nodebug
index bf3917de5..4beecc2dc 100644
--- a/config-nodebug
+++ b/config-nodebug
@@ -103,3 +103,4 @@ CONFIG_DETECT_HUNG_TASK=y
CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
diff --git a/config-x86-generic b/config-x86-generic
index 421e22bd1..23044c463 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -310,7 +310,7 @@ CONFIG_HP_ILO=m
CONFIG_BACKLIGHT_APPLE=m
-# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
+CONFIG_X86_CHECK_BIOS_CORRUPTION=y
# CONFIG_CMDLINE_BOOL is not set
diff --git a/kernel.spec b/kernel.spec
index cdba17af8..37002aa0b 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2318,6 +2318,10 @@ fi
# || ||
%changelog
* Fri Jan 13 2012 Dave Jones <davej@redhat.com>
+- Enable CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK
+ (On by default in rawhide/-debug)
+
+* Fri Jan 13 2012 Dave Jones <davej@redhat.com>
- Disable memory hotplug on x86-64
* Fri Jan 13 2012 Dave Jones <davej@redhat.com>