summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKyle McMartin <kyle@redhat.com>2011-01-10 14:00:14 -0500
committerKyle McMartin <kyle@redhat.com>2011-01-10 14:00:14 -0500
commitd9fdd68cbee5f54cfdc6350747621bbc9c93d275 (patch)
treec92f07b8d1e6e5f4e7fb49dd63b3c8ea2eb7262c
parent173354353e0a7bfa2c8d3dcd77e5fee6d9237a32 (diff)
downloadkernel-d9fdd68cbee5f54cfdc6350747621bbc9c93d275.tar.gz
kernel-d9fdd68cbee5f54cfdc6350747621bbc9c93d275.tar.xz
kernel-d9fdd68cbee5f54cfdc6350747621bbc9c93d275.zip
disable CONFIG_DEBUG_SET_MODULE_RONX for now
-rw-r--r--Makefile4
-rw-r--r--config-debug2
-rw-r--r--config-nodebug2
-rw-r--r--kernel.spec6
4 files changed, 9 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 2685113da..705670ff1 100644
--- a/Makefile
+++ b/Makefile
@@ -94,7 +94,7 @@ debug:
@perl -pi -e 's/# CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER is not set/CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER=y/' config-nodebug
@perl -pi -e 's/# CONFIG_TEST_LIST_SORT is not set/CONFIG_TEST_LIST_SORT=y/' config-nodebug
- #@perl -pi -e 's/# CONFIG_DEBUG_SET_MODULE_RONX is not set/CONFIG_DEBUG_SET_MODULE_RONX=y/' config-nodebug
+ @perl -pi -e 's/# CONFIG_DEBUG_SET_MODULE_RONX is not set/CONFIG_DEBUG_SET_MODULE_RONX=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
@@ -173,7 +173,7 @@ release:
@perl -pi -e 's/CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER=y/# CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER is not set/' config-nodebug
@perl -pi -e 's/CONFIG_TEST_LIST_SORT=y/# CONFIG_TEST_LIST_SORT is not set/' config-nodebug
- #@perl -pi -e 's/CONFIG_DEBUG_SET_MODULE_RONX=y/# CONFIG_DEBUG_SET_MODULE_RONX is not set/' config-nodebug
+ @perl -pi -e 's/CONFIG_DEBUG_SET_MODULE_RONX=y/# CONFIG_DEBUG_SET_MODULE_RONX 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 86aa2cc04..1d45a8938 100644
--- a/config-debug
+++ b/config-debug
@@ -98,4 +98,4 @@ CONFIG_KDB_KEYBOARD=y
CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER=y
CONFIG_TEST_LIST_SORT=y
-CONFIG_DEBUG_SET_MODULE_RONX=y
+# CONFIG_DEBUG_SET_MODULE_RONX is not set
diff --git a/config-nodebug b/config-nodebug
index 89d3bd0c8..862e021c0 100644
--- a/config-nodebug
+++ b/config-nodebug
@@ -98,4 +98,4 @@ CONFIG_KDB_KEYBOARD=y
CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER=y
CONFIG_TEST_LIST_SORT=y
-CONFIG_DEBUG_SET_MODULE_RONX=y
+# CONFIG_DEBUG_SET_MODULE_RONX is not set
diff --git a/kernel.spec b/kernel.spec
index dfb97101b..cb2cf6fe6 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -51,7 +51,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be prepended with "0.", so
# for example a 3 here will become 0.3
#
-%global baserelease 1
+%global baserelease 2
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -1952,6 +1952,10 @@ fi
# || ||
%changelog
+* Mon Jan 10 2011 Kyle McMartin <kmcmartin@redhat.com> 2.6.38-0.rc0.git4.2
+- Disable DEBUG_SET_MODULE_RONX for now, it causes boot-up to fail since
+ dynamic ftrace is trying to rewrite instructions on module load.
+
* Mon Jan 10 2011 Kyle McMartin <kmcmartin@redhat.com>
- Drop obsolete linux-2.6-debug-nmi-timeout.patch