rpms/kernel/devel config-debug, 1.32, 1.33 config-generic, 1.331, 1.332 config-nodebug, 1.43, 1.44 kernel.spec, 1.1819, 1.1820

[Chuck Ebbert]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv340

Modified Files:
	config-debug config-generic config-nodebug kernel.spec 
Log Message:
Fix up multiple definition of debug options
  (EXT4_DEBUG, DEBUG_FORCE_WEAK_PER_CPU)


Index: config-debug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-debug,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- config-debug	11 Oct 2009 07:29:06 -0000	1.32
+++ config-debug	12 Oct 2009 01:52:11 -0000	1.33
@@ -56,3 +56,7 @@ CONFIG_DEBUG_CREDENTIALS=y
 CONFIG_EXT4_DEBUG=y
 
 CONFIG_DEBUG_PERF_USE_VMALLOC=y
+
+# off in both production debug and nodebug builds,
+#  on in rawhide nodebug builds
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.331
retrieving revision 1.332
diff -u -p -r1.331 -r1.332
--- config-generic	11 Oct 2009 22:51:57 -0000	1.331
+++ config-generic	12 Oct 2009 01:52:11 -0000	1.332
@@ -3148,7 +3148,6 @@ CONFIG_EXT4_FS=y
 CONFIG_EXT4_FS_XATTR=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
-CONFIG_EXT4_DEBUG=y
 CONFIG_EXT4DEV_COMPAT=y
 CONFIG_JBD2=y
 CONFIG_JBD2_DEBUG=y
@@ -4134,9 +4133,6 @@ CONFIG_PPS=m
 # This generates a huge amount of dmesg spew
 # CONFIG_DEBUG_KOBJECT is not set
 #
-# This is for ensuring alpha and s390 don't get broken by certain percpu problems
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-#
 #
 # These debug options are deliberatly left on (even in 'make release' kernels).
 # They aren't that much of a performance impact, and the value


Index: config-nodebug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-nodebug,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- config-nodebug	11 Oct 2009 07:29:06 -0000	1.43
+++ config-nodebug	12 Oct 2009 01:52:11 -0000	1.44
@@ -53,6 +53,8 @@ CONFIG_MMIOTRACE=y
 
 CONFIG_DEBUG_CREDENTIALS=y
 
+# off in both production debug and nodebug builds,
+#  on in rawhide nodebug builds
 CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y
 
 CONFIG_EXT4_DEBUG=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1819
retrieving revision 1.1820
diff -u -p -r1.1819 -r1.1820
--- kernel.spec	11 Oct 2009 22:51:57 -0000	1.1819
+++ kernel.spec	12 Oct 2009 01:52:11 -0000	1.1820
@@ -1986,6 +1986,10 @@ fi
 
 %changelog
 * Sun Oct 11 2009 Chuck Ebbert <cebbert at redhat.com>
+- Fix up multiple definition of debug options
+  (EXT4_DEBUG, DEBUG_FORCE_WEAK_PER_CPU)
+
+* Sun Oct 11 2009 Chuck Ebbert <cebbert at redhat.com>
 - 2.6.32-rc4
 - New config options:
   CONFIG_BE2ISCSI=m