summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2013-05-10 09:34:19 -0400
committerJosh Boyer <jwboyer@redhat.com>2013-05-10 09:34:19 -0400
commitd96b81ac0626bd30f5349584d206a5031aaf865b (patch)
treed679bba6bd33a99159ab9b986f840e5e50c05873
parentd937c7d4ce6dd808a44d72230c550643419e05e8 (diff)
downloadkernel-d96b81ac0626bd30f5349584d206a5031aaf865b.tar.gz
kernel-d96b81ac0626bd30f5349584d206a5031aaf865b.tar.xz
kernel-d96b81ac0626bd30f5349584d206a5031aaf865b.zip
Fix CONFIG_EDAC_DEBUG setting in debug kernels
-rw-r--r--Makefile.release1
-rw-r--r--config-generic1
-rw-r--r--config-nodebug2
3 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.release b/Makefile.release
index 22fc8ac5e..293fe583e 100644
--- a/Makefile.release
+++ b/Makefile.release
@@ -71,6 +71,7 @@ config-release:
@perl -pi -e 's/CONFIG_DEBUG_KMEMLEAK=y/# CONFIG_DEBUG_KMEMLEAK is not set/' config-nodebug
@perl -pi -e 's/CONFIG_MAC80211_MESSAGE_TRACING=y/# CONFIG_MAC80211_MESSAGE_TRACING is not set/' config-nodebug
@perl -pi -e 's/CONFIG_XFS_WARN=y/# CONFIG_XFS_WARN is not set/' config-nodebug
+ @perl -pi -e 's/CONFIG_EDAC_DEBUG=y/# CONFIG_EDAC_DEBUG is not set/' config-nodebug
@# Undo anything that make extremedebug might have set
@perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-debug
diff --git a/config-generic b/config-generic
index 3160c13f0..d1917dec7 100644
--- a/config-generic
+++ b/config-generic
@@ -3681,7 +3681,6 @@ CONFIG_JFS_FS=m
CONFIG_JFS_POSIX_ACL=y
CONFIG_JFS_SECURITY=y
CONFIG_XFS_FS=m
-# CONFIG_XFS_WARN is not set
# CONFIG_XFS_DEBUG is not set
# CONFIG_XFS_RT is not set
CONFIG_XFS_QUOTA=y
diff --git a/config-nodebug b/config-nodebug
index 5b0d69558..5ff12b5bb 100644
--- a/config-nodebug
+++ b/config-nodebug
@@ -117,6 +117,6 @@ CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
# CONFIG_MAC80211_MESSAGE_TRACING is not set
-# CONFIG_EDAC_DEBUG is not set
+CONFIG_EDAC_DEBUG=y
# CONFIG_SPI_DEBUG is not set