diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | Makefile.release | 2 | ||||
| -rw-r--r-- | config-debug | 2 | ||||
| -rw-r--r-- | config-generic | 1 | ||||
| -rw-r--r-- | config-nodebug | 2 | ||||
| -rw-r--r-- | kernel.spec | 3 |
6 files changed, 4 insertions, 8 deletions
@@ -93,8 +93,6 @@ debug: @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_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 diff --git a/Makefile.release b/Makefile.release index 14b6afd40..c3f429bd9 100644 --- a/Makefile.release +++ b/Makefile.release @@ -68,8 +68,6 @@ config-release: @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_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 5814f1e12..c6815cd51 100644 --- a/config-debug +++ b/config-debug @@ -99,8 +99,6 @@ CONFIG_KDB_KEYBOARD=y CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER=y CONFIG_TEST_LIST_SORT=y -CONFIG_DEBUG_SET_MODULE_RONX=y - CONFIG_DETECT_HUNG_TASK=y CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set diff --git a/config-generic b/config-generic index 8a77f32a0..5091ea231 100644 --- a/config-generic +++ b/config-generic @@ -4562,6 +4562,7 @@ CONFIG_DEBUG_SHIRQ=y CONFIG_DEBUG_DEVRES=y CONFIG_DEBUG_RODATA_TEST=y CONFIG_DEBUG_NX_TEST=m +CONFIG_DEBUG_SET_MODULE_RONX=y CONFIG_DEBUG_BOOT_PARAMS=y # CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set CONFIG_LOCKUP_DETECTOR=y diff --git a/config-nodebug b/config-nodebug index 7ed073311..bf3917de5 100644 --- a/config-nodebug +++ b/config-nodebug @@ -99,8 +99,6 @@ CONFIG_KDB_KEYBOARD=y CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER=y CONFIG_TEST_LIST_SORT=y -CONFIG_DEBUG_SET_MODULE_RONX=y - CONFIG_DETECT_HUNG_TASK=y CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set diff --git a/kernel.spec b/kernel.spec index 097fa2552..6264d15da 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2286,6 +2286,9 @@ fi # ||----w | # || || %changelog +* Thu Jan 05 2012 Dave Jones <davej@redhat.com> +- CONFIG_DEBUG_SET_MODULE_RONX should always be set. + * Thu Jan 05 2012 Dave Jones <davej@redhat.com> - 3.2.0-3 - Reenable debugging options. |