rpms/kernel/devel Makefile, 1.76, 1.77 config-debug, 1.15, 1.16 config-generic, 1.156, 1.157 config-nodebug, 1.17, 1.18 kernel.spec, 1.877, 1.878

[Chuck Ebbert (cebbert)]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10469

Modified Files:
	Makefile config-debug config-generic config-nodebug 
	kernel.spec 
Log Message:
Enable CONFIG_MODULE_FORCE_UNLOAD for -debug kernels.


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Makefile,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- Makefile	15 Jul 2008 19:52:26 -0000	1.76
+++ Makefile	13 Aug 2008 20:28:28 -0000	1.77
@@ -63,6 +63,7 @@
 	@perl -pi -e 's/# CONFIG_X86_PTDUMP is not set/CONFIG_X86_PTDUMP=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_CAN_DEBUG_DEVICES is not set/CONFIG_CAN_DEBUG_DEVICES=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_SND_DEBUG_VERBOSE is not set/CONFIG_SND_DEBUG_VERBOSE=y/' config-nodebug
+	@perl -pi -e 's/# CONFIG_MODULE_FORCE_UNLOAD is not set/CONFIG_MODULE_FORCE_UNLOAD=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
 
@@ -98,6 +99,7 @@
 	@perl -pi -e 's/CONFIG_X86_PTDUMP=y/# CONFIG_X86_PTDUMP is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_CAN_DEBUG_DEVICES=y/# CONFIG_CAN_DEBUG_DEVICES is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_SND_DEBUG_VERBOSE=y/# CONFIG_SND_DEBUG_VERBOSE is not set/' config-nodebug
+	@perl -pi -e 's/CONFIG_MODULE_FORCE_UNLOAD=y/# CONFIG_MODULE_FORCE_UNLOAD is not set/' config-nodebug
 
 	@perl -pi -e 's/^%define debugbuildsenabled 0/%define debugbuildsenabled 1/' kernel.spec
 


Index: config-debug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-debug,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- config-debug	15 Jul 2008 13:51:23 -0000	1.15
+++ config-debug	13 Aug 2008 20:28:28 -0000	1.16
@@ -42,3 +42,5 @@
 CONFIG_X86_PTDUMP=y
 
 CONFIG_CAN_DEBUG_DEVICES=y
+
+CONFIG_MODULE_FORCE_UNLOAD=y


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- config-generic	13 Aug 2008 02:10:08 -0000	1.156
+++ config-generic	13 Aug 2008 20:28:28 -0000	1.157
@@ -65,7 +65,7 @@
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_FORCE_LOAD is not set
-# CONFIG_MODULE_FORCE_UNLOAD is not set
+# -- MODULE_FORCE_UNLOAD is controlled by config-debug/nodebug
 # CONFIG_MODVERSIONS is not set
 CONFIG_MODULE_SRCVERSION_ALL=y
 CONFIG_KMOD=y


Index: config-nodebug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-nodebug,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- config-nodebug	15 Jul 2008 13:51:23 -0000	1.17
+++ config-nodebug	13 Aug 2008 20:28:28 -0000	1.18
@@ -41,3 +41,5 @@
 CONFIG_X86_PTDUMP=y
 
 CONFIG_CAN_DEBUG_DEVICES=y
+
+CONFIG_MODULE_FORCE_UNLOAD=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.877
retrieving revision 1.878
diff -u -r1.877 -r1.878
--- kernel.spec	13 Aug 2008 03:17:46 -0000	1.877
+++ kernel.spec	13 Aug 2008 20:28:28 -0000	1.878
@@ -1745,6 +1745,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Wed Aug 13 2008 Chuck Ebbert <cebbert at redhat.com>
+- Enable CONFIG_MODULE_FORCE_UNLOAD for -debug kernels.
+
 * Tue Aug 12 2008 Dave Jones <davej at redhat.com>
 - 2.6.27-rc3