rpms/kernel/devel Makefile, 1.111, 1.112 config-debug, 1.30, 1.31 config-generic, 1.326, 1.327 config-nodebug, 1.40, 1.41 kernel.spec, 1.1810, 1.1811

[Chuck Ebbert]

Author: cebbert

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

Modified Files:
	Makefile config-debug config-generic config-nodebug 
	kernel.spec 
Log Message:
Fix up some items missing in make debug vs. make release,
  rearrange so the options are in the same order.
Add new debug options:
  CONFIG_EXT4_DEBUG
  CONFIG_DEBUG_FORCE_WEAK_PER_CPU


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Makefile,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -p -r1.111 -r1.112
--- Makefile	28 Sep 2009 20:40:26 -0000	1.111
+++ Makefile	28 Sep 2009 22:41:52 -0000	1.112
@@ -75,6 +75,7 @@ debug:
 	@perl -pi -e 's/CONFIG_STRIP_ASM_SYMS=y/# CONFIG_STRIP_ASM_SYMS is not set/' config-nodebug
 	@perl -pi -e 's/# CONFIG_DEBUG_CREDENTIALS is not set/CONFIG_DEBUG_CREDENTIALS=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_ACPI_DEBUG is not set/CONFIG_ACPI_DEBUG=y/' config-nodebug
+	@perl -pi -e 's/# CONFIG_EXT4_DEBUG is not set/CONFIG_EXT4_DEBUG=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
@@ -124,6 +125,7 @@ release:
 	@perl -pi -e 's/# CONFIG_STRIP_ASM_SYMS is not set/CONFIG_STRIP_ASM_SYMS=y/' config-nodebug
 	@perl -pi -e 's/CONFIG_DEBUG_CREDENTIALS=y/# CONFIG_DEBUG_CREDENTIALS is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_ACPI_DEBUG=y/# CONFIG_ACPI_DEBUG is not set/' config-nodebug
+	@perl -pi -e 's/CONFIG_EXT4_DEBUG=y/# CONFIG_EXT4_DEBUG 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


Index: config-debug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-debug,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- config-debug	14 Sep 2009 21:33:54 -0000	1.30
+++ config-debug	28 Sep 2009 22:41:52 -0000	1.31
@@ -52,3 +52,5 @@ CONFIG_DMA_API_DEBUG=y
 CONFIG_MMIOTRACE=y
 
 CONFIG_DEBUG_CREDENTIALS=y
+
+CONFIG_EXT4_DEBUG=y


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.326
retrieving revision 1.327
diff -u -p -r1.326 -r1.327
--- config-generic	15 Sep 2009 15:12:45 -0000	1.326
+++ config-generic	28 Sep 2009 22:41:52 -0000	1.327
@@ -4073,6 +4073,9 @@ 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.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- config-nodebug	28 Sep 2009 20:40:26 -0000	1.40
+++ config-nodebug	28 Sep 2009 22:41:52 -0000	1.41
@@ -52,3 +52,5 @@ CONFIG_DMA_API_DEBUG=y
 CONFIG_MMIOTRACE=y
 
 CONFIG_DEBUG_CREDENTIALS=y
+
+CONFIG_EXT4_DEBUG=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1810
retrieving revision 1.1811
diff -u -p -r1.1810 -r1.1811
--- kernel.spec	28 Sep 2009 20:40:26 -0000	1.1810
+++ kernel.spec	28 Sep 2009 22:41:52 -0000	1.1811
@@ -1986,6 +1986,9 @@ fi
 * Mon Sep 28 2009 Chuck Ebbert <cebbert at redhat.com>
 - Fix up some items missing in make debug vs. make release,
   rearrange so the options are in the same order.
+- Add new debug options:
+  CONFIG_EXT4_DEBUG
+  CONFIG_DEBUG_FORCE_WEAK_PER_CPU
 
 * Sun Sep 27 2009 Kyle McMartin <kyle at redhat.com>
 - 2.6.31-git18